OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-22 19:57:50 +00:00
parent 292ab783e4
commit e98e580900
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Controls whether physics can be applied to prims. Even if false, prims still have entries in a /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
/// PhysicsScene in order to perform collision detection /// PhysicsScene in order to perform collision detection
/// </summary> /// </summary>
public bool m_physicalPrim; public bool PhysicalPrims { get; private set; }
/// <summary> /// <summary>
/// Controls whether prims can be collided with. /// Controls whether prims can be collided with.
@ -674,7 +674,7 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: Change default to true once the feature is supported // TODO: Change default to true once the feature is supported
m_usePreJump = startupConfig.GetBoolean("enableprejump", false); m_usePreJump = startupConfig.GetBoolean("enableprejump", false);
m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1772,7 +1772,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="isNew"></param> /// <param name="isNew"></param>
public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew) public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
{ {
if (!ParentGroup.Scene.m_physicalPrim && UsePhysics) if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
return; return;
if (IsJoint()) if (IsJoint())