diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 51cc76374e..fe8475a600 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4561,11 +4561,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (recipientID == data.OwnerID)
             {
-                if ((data.Flags & PrimFlags.CreateSelected) != 0)
+                if (data.CreateSelected)
                 {
                     // Only send this flag once, then unset it
                     flags |= PrimFlags.CreateSelected;
-                    data.Flags &= ~PrimFlags.CreateSelected;
+                    data.CreateSelected = false;
                 }
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 445c2c8c28..5fbc65811e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1542,7 +1542,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // We need to explicitly resend the newly link prim's object properties since no other actions
                 // occur on link to invoke this elsewhere (such as object selection)
-                parentGroup.RootPart.AddFlag(PrimFlags.CreateSelected);
+                parentGroup.RootPart.CreateSelected = true;
                 parentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
             finally
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9ebb168127..509ec01777 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2486,7 +2486,7 @@ namespace OpenSim.Region.Framework.Scenes
             linkPart.LinkNum = 2;
 
             linkPart.SetParent(this);
-            linkPart.AddFlag(PrimFlags.CreateSelected);
+            linkPart.CreateSelected = true;
 
             //if (linkPart.PhysActor != null)
             //{
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 6e73b65450..2f4191da44 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -388,7 +388,6 @@ namespace OpenSim.Region.Framework.Scenes
             // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
 
             _flags = 0;
-            _flags |= PrimFlags.CreateSelected;
 
             TrimPermissions();
             //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo());
@@ -418,6 +417,7 @@ namespace OpenSim.Region.Framework.Scenes
         private PrimFlags _flags = 0;
         private DateTime m_expires;
         private DateTime m_rezzed;
+        private bool m_createSelected = true;
 
         public UUID CreatorID 
         {
@@ -978,6 +978,13 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_updateFlag = value; }
         }
 
+        [XmlIgnore]
+        public bool CreateSelected
+        {
+            get { return m_createSelected; }
+            set { m_createSelected = value; }
+        }
+
         #endregion
 
 //---------------
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index bb02fa3ba9..228ab6d48c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3742,7 +3742,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             parentPrim.TriggerScriptChangedEvent(Changed.LINK);
-            parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected);
+            parentPrim.RootPart.CreateSelected = true;
             parentPrim.HasGroupChanged = true;
             parentPrim.ScheduleGroupForFullUpdate();