Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 0 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 11dad6c..680a6fa 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -316,7 +316,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_SOPXmlProcessors.Add("ClickAction", ProcessClickAction);
             m_SOPXmlProcessors.Add("Shape", ProcessShape);
             m_SOPXmlProcessors.Add("Scale", ProcessScale);
-            m_SOPXmlProcessors.Add("UpdateFlag", ProcessUpdateFlag);
             m_SOPXmlProcessors.Add("SitTargetOrientation", ProcessSitTargetOrientation);
             m_SOPXmlProcessors.Add("SitTargetPosition", ProcessSitTargetPosition);
             m_SOPXmlProcessors.Add("SitTargetPositionLL", ProcessSitTargetPositionLL);
@@ -586,11 +585,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.Scale = Util.ReadVector(reader, "Scale");
         }
 
-        private static void ProcessUpdateFlag(SceneObjectPart obj, XmlTextReader reader)
-        {
-            obj.UpdateFlag = (byte)reader.ReadElementContentAsInt("UpdateFlag", String.Empty);
-        }
-
         private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlTextReader reader)
         {
             obj.SitTargetOrientation = Util.ReadQuaternion(reader, "SitTargetOrientation");
@@ -1194,7 +1188,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             WriteShape(writer, sop.Shape, options);
 
             WriteVector(writer, "Scale", sop.Scale);
-            writer.WriteElementString("UpdateFlag", sop.UpdateFlag.ToString());
             WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation); 
             WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition);
             WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL);