Melanie 72206a0e29 Merge branch 'avination-current' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs		2013-09-16 22:32:53 +01:00
..
Application	Merge branch 'avination-current' into careminster	2013-09-16 22:32:53 +01:00
ClientStack	Merge branch 'avination-current' into careminster	2013-09-16 22:32:53 +01:00
CoreModules	Merge branch 'avination-current' into careminster	2013-09-16 22:32:53 +01:00
DataSnapshot	DataSnapshot: changed those annoying messages to Debug instead of Info.	2013-06-12 17:48:20 -07:00
Framework	Merge branch 'avination-current' into careminster	2013-09-16 22:32:53 +01:00
OptionalModules	Merge branch 'master' into careminster	2013-09-07 13:54:19 +01:00
Physics	Merge branch 'master' into careminster	2013-09-01 22:49:31 +01:00
RegionCombinerModule	Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.	2013-07-16 17:43:36 -07:00
ReplaceableModules	Some module reshuffling, no user functionality yet	2009-07-10 20:46:16 +00:00
ScriptEngine	Merge branch 'avination-current' into careminster	2013-09-16 22:32:53 +01:00
UserStatistics	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00