aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorMelanie2011-06-11 12:08:02 +0100
committerMelanie2011-06-11 12:08:02 +0100
commita1c16a42002757f65d77b530571405bd740bf2f7 (patch)
tree6b86e3ddd09538f83c541a36d02f6668eeed8745 /OpenSim/Region/Framework/Scenes/Serialization
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdded a Sleep in between each site call, to slow the xml-rpc requests down. (diff)
downloadopensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.zip
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.gz
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.bz2
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 5c284b9..9174070 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1178,7 +1178,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1178 writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture)); 1178 writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
1179 writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture)); 1179 writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
1180 writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture)); 1180 writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
1181 writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture)); 1181 writer.WriteElementString("A", sop.Color.A.ToString(Utils.EnUsCulture));
1182 writer.WriteEndElement(); 1182 writer.WriteEndElement();
1183 1183
1184 writer.WriteElementString("Text", sop.Text); 1184 writer.WriteElementString("Text", sop.Text);