aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-12 14:28:31 -0800
committerJohn Hurliman2010-03-12 14:28:31 -0800
commit3036aba875187923b4e4d8481d46334e53393107 (patch)
tree4aa2b5ba3687873e0be69cee84a0652c9f2dd136 /OpenSim/Region/Framework
parentFixing the previous patch to work correctly with standalone mode (diff)
downloadopensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.zip
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.gz
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.bz2
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.xz
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8967252..a2b98b9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2044,6 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
2044 { 2044 {
2045 m_lastColliders.Remove(localID); 2045 m_lastColliders.Remove(localID);
2046 } 2046 }
2047
2047 if (m_parentGroup == null) 2048 if (m_parentGroup == null)
2048 return; 2049 return;
2049 if (m_parentGroup.IsDeleted) 2050 if (m_parentGroup.IsDeleted)