Melanie fcecfc81bb Multiattach, part 1 ...

Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-03-18 22:56:03 +00:00

..

Interfaces

Use an integer when specifying the XWorkItem wait rather than a TimeSpan to avoid a Windows casting issue in SmartThreadPool for large TimeSpans.

2013-02-12 21:34:12 +00:00

Shared

Multiattach, part 1

2013-03-18 22:56:03 +00:00

XEngine

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00