aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-11 00:08:18 +0000
committerTeravus Ovares2007-11-11 00:08:18 +0000
commitec77e1eb17f032458dbe93c0a1eab5aee604112f (patch)
tree002992e71a443d80b44ebcbf497dfe17ce7a1625 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parentremoved OdePlugin/Meshing directory (diff)
downloadopensim-SC_OLD-ec77e1eb17f032458dbe93c0a1eab5aee604112f.zip
opensim-SC_OLD-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.gz
opensim-SC_OLD-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.bz2
opensim-SC_OLD-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.xz
* adds flag in OpenSim.ini for disabling physical prim. Look at OpenSim.ini.example in the bin folder for an example.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index f5e6f63..f840845 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -446,7 +446,7 @@ namespace OpenSim.Region.Environment.Scenes
446 AddEntity(group); 446 AddEntity(group);
447 group.AbsolutePosition = pos; 447 group.AbsolutePosition = pos;
448 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 448 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
449 bool UsePhysics = ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0); 449 bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0)&& m_physicalPrim);
450 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) 450 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
451 { 451 {
452 PrimitiveBaseShape pbs = rootPart.Shape; 452 PrimitiveBaseShape pbs = rootPart.Shape;