diff options
author | Justin Clark-Casey (justincc) | 2010-12-17 22:40:11 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-17 22:40:11 +0000 |
commit | 3d32f05cded90da3d3ad318220dfc30b64df5845 (patch) | |
tree | dae57537ae648dacf4667e53325bd0a9aa8e885c /OpenSim/Region/Framework | |
parent | remove mono compiler warnings (diff) | |
download | opensim-SC-3d32f05cded90da3d3ad318220dfc30b64df5845.zip opensim-SC-3d32f05cded90da3d3ad318220dfc30b64df5845.tar.gz opensim-SC-3d32f05cded90da3d3ad318220dfc30b64df5845.tar.bz2 opensim-SC-3d32f05cded90da3d3ad318220dfc30b64df5845.tar.xz |
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 16 |
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 6c9826f..605521a 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 | |||
1114 | WriteVector(writer, "AngularVelocity", sop.AngularVelocity); | 1114 | WriteVector(writer, "AngularVelocity", sop.AngularVelocity); |
1115 | WriteVector(writer, "Acceleration", sop.Acceleration); | 1115 | WriteVector(writer, "Acceleration", sop.Acceleration); |
1116 | writer.WriteElementString("Description", sop.Description); | 1116 | writer.WriteElementString("Description", sop.Description); |
1117 | if (sop.Color != null) | 1117 | |
1118 | { | 1118 | writer.WriteStartElement("Color"); |
1119 | writer.WriteStartElement("Color"); | 1119 | writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture)); |
1120 | writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture)); | 1120 | writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture)); |
1121 | writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture)); | 1121 | writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture)); |
1122 | writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture)); | 1122 | writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture)); |
1123 | writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture)); | 1123 | writer.WriteEndElement(); |
1124 | writer.WriteEndElement(); | ||
1125 | } | ||
1126 | 1124 | ||
1127 | writer.WriteElementString("Text", sop.Text); | 1125 | writer.WriteElementString("Text", sop.Text); |
1128 | writer.WriteElementString("SitName", sop.SitName); | 1126 | writer.WriteElementString("SitName", sop.SitName); |