From ec77e1eb17f032458dbe93c0a1eab5aee604112f Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 11 Nov 2007 00:08:18 +0000
Subject: * adds flag in OpenSim.ini for disabling physical prim.  Look at
 OpenSim.ini.example in the bin folder for an example.

---
 OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
index e0ddec5..c2bb019 100644
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
                     m_innerScene.AddEntity(obj);
 
                     SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
-                    bool UsePhysics = ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0);
+                    bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim);
                     if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
                         rootPart.PhysActor = m_innerScene.PhyScene.AddPrimShape(
                             rootPart.Name,
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_innerScene.AddEntityFromStorage(obj);
 
             SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
-            bool UsePhysics = ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0);
+            bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim);
             if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
                 rootPart.PhysActor = m_innerScene.PhyScene.AddPrimShape(
                     rootPart.Name,
-- 
cgit v1.1