aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7e1bbfa..b4c8b68 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Scenes
68 private int m_timeUpdateCount; 68 private int m_timeUpdateCount;
69 69
70 private readonly Mutex updateLock; 70 private readonly Mutex updateLock;
71 71 public bool m_physicalPrim;
72 protected ModuleLoader m_moduleLoader; 72 protected ModuleLoader m_moduleLoader;
73 protected StorageManager m_storageManager; 73 protected StorageManager m_storageManager;
74 protected AgentCircuitManager m_authenticateHandler; 74 protected AgentCircuitManager m_authenticateHandler;
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Scenes
192 192
193 public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 193 public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
194 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 194 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
195 ModuleLoader moduleLoader, bool dumpAssetsToFile) 195 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim)
196 { 196 {
197 updateLock = new Mutex(false); 197 updateLock = new Mutex(false);
198 198
@@ -207,6 +207,7 @@ namespace OpenSim.Region.Environment.Scenes
207 m_regionName = m_regInfo.RegionName; 207 m_regionName = m_regInfo.RegionName;
208 m_datastore = m_regInfo.DataStore; 208 m_datastore = m_regInfo.DataStore;
209 RegisterRegionWithComms(); 209 RegisterRegionWithComms();
210 m_physicalPrim = physicalPrim;
210 211
211 m_LandManager = new LandManager(this, m_regInfo); 212 m_LandManager = new LandManager(this, m_regInfo);
212 m_estateManager = new EstateManager(this, m_regInfo); 213 m_estateManager = new EstateManager(this, m_regInfo);
@@ -522,7 +523,7 @@ namespace OpenSim.Region.Environment.Scenes
522 { 523 {
523 AddEntityFromStorage(prim); 524 AddEntityFromStorage(prim);
524 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID); 525 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID);
525 bool UsePhysics = ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0); 526 bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim);
526 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) 527 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
527 rootPart.PhysActor = phyScene.AddPrimShape( 528 rootPart.PhysActor = phyScene.AddPrimShape(
528 rootPart.Name, 529 rootPart.Name,
@@ -572,7 +573,7 @@ namespace OpenSim.Region.Environment.Scenes
572 rootPart.ObjectFlags += (uint) LLObject.ObjectFlags.Phantom; 573 rootPart.ObjectFlags += (uint) LLObject.ObjectFlags.Phantom;
573 } 574 }
574 // if not phantom, add to physics 575 // if not phantom, add to physics
575 bool UsePhysics = ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0); 576 bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim);
576 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) 577 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
577 rootPart.PhysActor = 578 rootPart.PhysActor =
578 phyScene.AddPrimShape( 579 phyScene.AddPrimShape(