Dan Lake 327f30e6d1 Merge branch 'master' into dev ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs		2011-06-15 14:13:58 -07:00
..
storage	…
CenomeCache.ini.example	…
FlotsamCache.ini.example	…
Grid.ini	…
GridCommon.ini.example	…
GridHypergrid.ini	…
HyperSimianGrid.ini	…
SimianGrid.ini	…
Standalone.ini	…
StandaloneCommon.ini.example	…
StandaloneHypergrid.ini	…