aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-22 19:57:50 +0000
committerJustin Clark-Casey (justincc)2011-12-22 19:57:50 +0000
commit7ccd8f8f1d8accb0c5f67e9e3bc9a43fbbfd93e2 (patch)
tree3c59d8f4bedfd9d97e0e66e5e9092a2f3d423e4e /OpenSim/Region/Framework
parentRemove unused m_physicalPrim parameter from SOG.ApplyPhysics() (diff)
downloadopensim-SC_OLD-7ccd8f8f1d8accb0c5f67e9e3bc9a43fbbfd93e2.zip
opensim-SC_OLD-7ccd8f8f1d8accb0c5f67e9e3bc9a43fbbfd93e2.tar.gz
opensim-SC_OLD-7ccd8f8f1d8accb0c5f67e9e3bc9a43fbbfd93e2.tar.bz2
opensim-SC_OLD-7ccd8f8f1d8accb0c5f67e9e3bc9a43fbbfd93e2.tar.xz
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 96e6863..b4972d6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
77 /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a 77 /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
78 /// PhysicsScene in order to perform collision detection 78 /// PhysicsScene in order to perform collision detection
79 /// </summary> 79 /// </summary>
80 public bool m_physicalPrim; 80 public bool PhysicalPrims { get; private set; }
81 81
82 /// <summary> 82 /// <summary>
83 /// Controls whether prims can be collided with. 83 /// Controls whether prims can be collided with.
@@ -658,7 +658,7 @@ namespace OpenSim.Region.Framework.Scenes
658 //Animation states 658 //Animation states
659 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); 659 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
660 660
661 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 661 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
662 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); 662 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
663 663
664 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 664 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8fd136d..aea47e6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1742,7 +1742,7 @@ namespace OpenSim.Region.Framework.Scenes
1742 /// <param name="isNew"></param> 1742 /// <param name="isNew"></param>
1743 public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew) 1743 public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
1744 { 1744 {
1745 if (!ParentGroup.Scene.m_physicalPrim && UsePhysics) 1745 if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
1746 return; 1746 return;
1747 1747
1748 if (IsJoint()) 1748 if (IsJoint())