diff options
author | Melanie Thielker | 2010-05-31 19:00:02 +0200 |
---|---|---|
committer | Melanie | 2010-05-31 17:55:56 +0100 |
commit | e515467c5e9a03de8d0df8e24d1ca70636f6e099 (patch) | |
tree | 25ef47db6265bbcbb9d5578a1577c125f1ce7340 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Fix a nullref in EventManager caused by RegionReady not setting the scene (diff) | |
download | opensim-SC_OLD-e515467c5e9a03de8d0df8e24d1ca70636f6e099.zip opensim-SC_OLD-e515467c5e9a03de8d0df8e24d1ca70636f6e099.tar.gz opensim-SC_OLD-e515467c5e9a03de8d0df8e24d1ca70636f6e099.tar.bz2 opensim-SC_OLD-e515467c5e9a03de8d0df8e24d1ca70636f6e099.tar.xz |
Fix create selection getting overwritten by multiple updates for the same prim.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b36b9bf..ce1972f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -387,7 +387,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
387 | // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log | 387 | // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log |
388 | 388 | ||
389 | _flags = 0; | 389 | _flags = 0; |
390 | _flags |= PrimFlags.CreateSelected; | ||
391 | 390 | ||
392 | TrimPermissions(); | 391 | TrimPermissions(); |
393 | //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo()); | 392 | //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo()); |
@@ -417,6 +416,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
417 | private PrimFlags _flags = 0; | 416 | private PrimFlags _flags = 0; |
418 | private DateTime m_expires; | 417 | private DateTime m_expires; |
419 | private DateTime m_rezzed; | 418 | private DateTime m_rezzed; |
419 | private bool m_createSelected = true; | ||
420 | 420 | ||
421 | public UUID CreatorID | 421 | public UUID CreatorID |
422 | { | 422 | { |
@@ -967,6 +967,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
967 | set { m_updateFlag = value; } | 967 | set { m_updateFlag = value; } |
968 | } | 968 | } |
969 | 969 | ||
970 | [XmlIgnore] | ||
971 | public bool CreateSelected | ||
972 | { | ||
973 | get { return m_createSelected; } | ||
974 | set { m_createSelected = value; } | ||
975 | } | ||
976 | |||
970 | #endregion | 977 | #endregion |
971 | 978 | ||
972 | //--------------- | 979 | //--------------- |