aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-08 19:55:33 +0000
committerHomer Horwitz2008-11-08 19:55:33 +0000
commit4da49410657af9e95aafd0e0803ddfc87f4797c0 (patch)
tree55fcf7ea6f9502d05652f00409fd0cfcb42b584f
parent* Missed a file from previous checkin. (diff)
downloadopensim-SC-4da49410657af9e95aafd0e0803ddfc87f4797c0.zip
opensim-SC-4da49410657af9e95aafd0e0803ddfc87f4797c0.tar.gz
opensim-SC-4da49410657af9e95aafd0e0803ddfc87f4797c0.tar.bz2
opensim-SC-4da49410657af9e95aafd0e0803ddfc87f4797c0.tar.xz
Mantis #2553: Thank you, idb, for a fix that helps to persist changes in prim attributes.
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index bdeaa6f..3501224 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -3058,6 +3058,13 @@ if (m_shape != null) {
3058 { 3058 {
3059 3059
3060 bool wasUsingPhysics = ((ObjectFlags & (uint) PrimFlags.Physics) != 0); 3060 bool wasUsingPhysics = ((ObjectFlags & (uint) PrimFlags.Physics) != 0);
3061 bool wasTemporary = ((ObjectFlags & (uint)PrimFlags.TemporaryOnRez) != 0);
3062 bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0);
3063
3064 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom))
3065 {
3066 return;
3067 }
3061 3068
3062 if (UsePhysics) 3069 if (UsePhysics)
3063 { 3070 {
@@ -3151,6 +3158,7 @@ if (m_shape != null) {
3151 RemFlag(PrimFlags.TemporaryOnRez); 3158 RemFlag(PrimFlags.TemporaryOnRez);
3152 } 3159 }
3153 // System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); 3160 // System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
3161 ParentGroup.HasGroupChanged = true;
3154 ScheduleFullUpdate(); 3162 ScheduleFullUpdate();
3155 } 3163 }
3156 3164