OpenSimMirror/OpenSim/Region
Dan Lake 1837778cf9 Merge branch 'master' into dev
Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-02-14 13:39:27 -08:00
..
Application Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
ClientStack Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
CoreModules Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
DataSnapshot
Examples/SimpleModule Updates for appearance and attachments 2011-01-06 09:20:59 -08:00
Framework Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
OptionalModules Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
Physics move logging to central module. Fix orientation bug. Fix message echo bug. 2011-01-28 13:59:04 -08:00
RegionCombinerModule When an oar is loaded, do not create a default parcel before loading the parcels from the OAR. 2011-01-27 20:36:50 +00:00
ReplaceableModules
ScriptEngine Merge branch 'master' into dev 2011-02-14 13:39:27 -08:00
UserStatistics