Melanie 9733b64dc8 Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2011-10-12 02:02:46 +01:00

..

Application

Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge

2011-10-12 01:41:59 +01:00

ClientStack

Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge

2011-10-11 23:21:36 +01:00

CoreModules

Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge

2011-10-12 01:39:38 +01:00

DataSnapshot

Eliminate pointless checks of SOG.RootPart != null

2011-09-01 02:11:00 +01:00

Framework

Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge

2011-10-12 02:02:46 +01:00

OptionalModules

Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge

2011-10-12 02:02:46 +01:00

Physics

Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge

2011-10-12 01:41:44 +01:00

RegionCombinerModule

Merge branch 'master' into careminster-presence-refactor

2011-04-06 09:22:55 +01:00

ReplaceableModules

…

ScriptEngine

Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge

2011-10-12 00:10:30 +01:00

UserStatistics

rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a single one

2011-10-05 23:36:27 +01:00