OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region
History
Melanie 6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 		2012-10-12 19:05:06 +01:00
..
Application Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
ClientStack Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
CoreModules Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
DataSnapshot minor: resolve some mono compiler warnings 2012-05-03 01:56:24 +01:00
Framework Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
OptionalModules Merge branch 'master' into careminster 2012-10-07 02:48:28 +01:00
Physics Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
RegionCombinerModule Move addin attributes to RegionCombinerModule.addin.xml 2012-09-07 13:21:06 -04:00
ReplaceableModules
…
ScriptEngine Merge branch 'master' into careminster 2012-10-12 19:05:06 +01:00
UserStatistics refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents 2012-10-06 04:06:27 +01:00