Merge branch 'master' into careminster-presence-refactor

1 files changed, 7 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 6c13eb5..b2b3ad9 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1114,15 +1114,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             WriteVector(writer, "AngularVelocity", sop.AngularVelocity);
             WriteVector(writer, "Acceleration", sop.Acceleration);
             writer.WriteElementString("Description", sop.Description);
-            if (sop.Color != null)
-            {
-                writer.WriteStartElement("Color");
-                writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
-                writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
-                writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
-                writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture));
-                writer.WriteEndElement();
-            }
+
+            writer.WriteStartElement("Color");
+            writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
 
             writer.WriteElementString("Text", sop.Text);
             writer.WriteElementString("SitName", sop.SitName);