OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region
History
Melanie f3132c45d9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 		2012-03-31 02:18:02 +01:00
..
Application Merge branch 'master' into careminster 2012-03-25 20:07:43 +01:00
ClientStack Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
CoreModules Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
DataSnapshot Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want. 2012-03-13 08:06:30 -07:00
Framework Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
OptionalModules Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
Physics Merge branch 'master' into careminster 2012-03-27 18:11:05 +01:00
RegionCombinerModule Merge branch 'master' into careminster 2012-03-11 02:29:43 +00:00
ReplaceableModules
…
ScriptEngine Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
UserStatistics Call Dispose() via using() on SqliteCommands in WebStatsModule after use. 2012-02-28 22:54:21 +00:00