Melanie 914f97cb76 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-08-18 19:01:05 +01:00
..
Application	Merge branch 'master' into careminster	2012-08-16 02:46:48 +01:00
ClientStack	Actually add the module	2012-08-14 22:22:25 +01:00
CoreModules	Add a real_id field to the login response if impersonation is used. The wrapper	2012-08-15 23:31:38 +02:00
DataSnapshot	minor: resolve some mono compiler warnings	2012-05-03 01:56:24 +01:00
Framework	Merge branch 'master' into careminster	2012-08-18 13:17:39 +01:00
OptionalModules	Remove XML debug spam from vivox voice	2012-08-16 00:59:58 +02:00
Physics	Merge branch 'master' into careminster	2012-08-18 13:17:39 +01:00
RegionCombinerModule	Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).	2012-07-27 00:28:23 +01:00
ReplaceableModules	…
ScriptEngine	Merge branch 'master' into careminster	2012-08-18 19:01:05 +01:00
UserStatistics	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00