OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region
History
Melanie 50321fb7bf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 		2012-05-09 00:43:33 +01:00
..
Application Merge branch 'master' into careminster 2012-05-05 10:32:04 +01:00
ClientStack Merge branch 'avination' into careminster 2012-05-08 00:07:13 +01:00
CoreModules Merge branch 'master' into careminster 2012-05-08 00:07:18 +01:00
DataSnapshot minor: resolve some mono compiler warnings 2012-05-03 01:56:24 +01:00
Framework Merge branch 'master' into careminster 2012-05-09 00:43:33 +01:00
OptionalModules Merge branch 'master' into careminster 2012-05-07 12:07:47 +01:00
Physics Merge branch 'avination' into careminster 2012-05-08 00:07:13 +01:00
RegionCombinerModule Merge branch 'master' into careminster 2012-03-11 02:29:43 +00:00
ReplaceableModules
…
ScriptEngine Merge branch 'master' into careminster 2012-05-09 00:43:33 +01:00
UserStatistics Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable. 2012-05-03 01:45:49 +01:00