aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-31 19:00:02 +0200
committerMelanie Thielker2010-05-31 19:00:02 +0200
commitd4b4cbf5a5fead727b5e2e48f69d2016eb942cff (patch)
tree4382d4fd3d53cf6bae3daf971793f19e8e1aa967 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentFix a nullref in EventManager caused by RegionReady not setting the scene (diff)
downloadopensim-SC-d4b4cbf5a5fead727b5e2e48f69d2016eb942cff.zip
opensim-SC-d4b4cbf5a5fead727b5e2e48f69d2016eb942cff.tar.gz
opensim-SC-d4b4cbf5a5fead727b5e2e48f69d2016eb942cff.tar.bz2
opensim-SC-d4b4cbf5a5fead727b5e2e48f69d2016eb942cff.tar.xz
Fix create selection getting overwritten by multiple updates for the same prim.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 6e73b65..2f4191d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -388,7 +388,6 @@ namespace OpenSim.Region.Framework.Scenes
388 // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log 388 // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
389 389
390 _flags = 0; 390 _flags = 0;
391 _flags |= PrimFlags.CreateSelected;
392 391
393 TrimPermissions(); 392 TrimPermissions();
394 //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo()); 393 //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo());
@@ -418,6 +417,7 @@ namespace OpenSim.Region.Framework.Scenes
418 private PrimFlags _flags = 0; 417 private PrimFlags _flags = 0;
419 private DateTime m_expires; 418 private DateTime m_expires;
420 private DateTime m_rezzed; 419 private DateTime m_rezzed;
420 private bool m_createSelected = true;
421 421
422 public UUID CreatorID 422 public UUID CreatorID
423 { 423 {
@@ -978,6 +978,13 @@ namespace OpenSim.Region.Framework.Scenes
978 set { m_updateFlag = value; } 978 set { m_updateFlag = value; }
979 } 979 }
980 980
981 [XmlIgnore]
982 public bool CreateSelected
983 {
984 get { return m_createSelected; }
985 set { m_createSelected = value; }
986 }
987
981 #endregion 988 #endregion
982 989
983//--------------- 990//---------------