aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-05 23:42:05 +0100
committerJustin Clark-Casey (justincc)2011-08-05 23:42:05 +0100
commitba89fc3aa1833c0fd6b5518d85ca966768597c6c (patch)
tree2713dcb4797e690e6edc21decfc6213d11b19230 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentGet "show region" command in GridService to show grid co-ordinates rather tha... (diff)
downloadopensim-SC_OLD-ba89fc3aa1833c0fd6b5518d85ca966768597c6c.zip
opensim-SC_OLD-ba89fc3aa1833c0fd6b5518d85ca966768597c6c.tar.gz
opensim-SC_OLD-ba89fc3aa1833c0fd6b5518d85ca966768597c6c.tar.bz2
opensim-SC_OLD-ba89fc3aa1833c0fd6b5518d85ca966768597c6c.tar.xz
Add regression test for setting phantom status on a scene object. This is not yet complete.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 90ad34e..e8a1070 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -261,12 +261,9 @@ namespace OpenSim.Region.Framework.Scenes
261 } 261 }
262 protected SceneObjectPartInventory m_inventory; 262 protected SceneObjectPartInventory m_inventory;
263 263
264
265 public bool Undoing; 264 public bool Undoing;
266
267 265
268 public bool IgnoreUndoUpdate = false; 266 public bool IgnoreUndoUpdate = false;
269
270 267
271 private PrimFlags LocalFlags; 268 private PrimFlags LocalFlags;
272 269
@@ -4645,6 +4642,8 @@ namespace OpenSim.Region.Framework.Scenes
4645 4642
4646 ParentGroup.HasGroupChanged = true; 4643 ParentGroup.HasGroupChanged = true;
4647 ScheduleFullUpdate(); 4644 ScheduleFullUpdate();
4645
4646// m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
4648 } 4647 }
4649 4648
4650 public void UpdateRotation(Quaternion rot) 4649 public void UpdateRotation(Quaternion rot)
@@ -4864,7 +4863,7 @@ namespace OpenSim.Region.Framework.Scenes
4864 // m_parentGroup.Scene.EventManager.OnScriptTimerEvent -= handleTimerAccounting; 4863 // m_parentGroup.Scene.EventManager.OnScriptTimerEvent -= handleTimerAccounting;
4865 //} 4864 //}
4866 4865
4867 LocalFlags=(PrimFlags)objectflagupdate; 4866 LocalFlags = (PrimFlags)objectflagupdate;
4868 4867
4869 if (m_parentGroup != null && m_parentGroup.RootPart == this) 4868 if (m_parentGroup != null && m_parentGroup.RootPart == this)
4870 { 4869 {