aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorroot2011-07-09 01:06:46 +0100
committerroot2011-07-09 01:06:46 +0100
commitc920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentRemove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parentInstance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
downloadopensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0746b06..980f7a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1603,6 +1603,8 @@ namespace OpenSim.Region.Framework.Scenes
1603 /// <param name="m_physicalPrim"></param> 1603 /// <param name="m_physicalPrim"></param>
1604 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) 1604 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim)
1605 { 1605 {
1606// m_log.DebugFormat("[SCENE OBJECT PART]: Applying physics to {0} {1} {2}", Name, LocalId, UUID);
1607
1606 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); 1608 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim);
1607 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); 1609 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0);
1608 1610
@@ -2974,7 +2976,6 @@ namespace OpenSim.Region.Framework.Scenes
2974 } 2976 }
2975 } 2977 }
2976 2978
2977
2978 public void SculptTextureCallback(UUID textureID, AssetBase texture) 2979 public void SculptTextureCallback(UUID textureID, AssetBase texture)
2979 { 2980 {
2980 if (m_shape.SculptEntry) 2981 if (m_shape.SculptEntry)