aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4171d17..a9a150a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3325,7 +3325,7 @@ if (m_shape != null) {
3325 bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); 3325 bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0);
3326 bool wasVD = VolumeDetectActive; 3326 bool wasVD = VolumeDetectActive;
3327 3327
3328 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD) ) 3328 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))
3329 { 3329 {
3330 return; 3330 return;
3331 } 3331 }
@@ -3477,7 +3477,7 @@ if (m_shape != null) {
3477 } 3477 }
3478 else 3478 else
3479 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like 3479 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
3480 // (mumbles, well, at least if you have infinte CPU powers :-) ) 3480 // (mumbles, well, at least if you have infinte CPU powers :-))
3481 if (this.PhysActor != null) 3481 if (this.PhysActor != null)
3482 { 3482 {
3483 PhysActor.SetVolumeDetect(0); 3483 PhysActor.SetVolumeDetect(0);