diff options
author | Justin Clark-Casey (justincc) | 2012-01-04 19:53:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-04 19:53:48 +0000 |
commit | aa625da6a631e4b7233013a56212ecd68b303f3f (patch) | |
tree | 4032533f2695a9355b49a8ceb40d0ccf6b651f20 /OpenSim/Region | |
parent | Remove the pointless LLClientView.m_imageManager null check. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-aa625da6a631e4b7233013a56212ecd68b303f3f.zip opensim-SC_OLD-aa625da6a631e4b7233013a56212ecd68b303f3f.tar.gz opensim-SC_OLD-aa625da6a631e4b7233013a56212ecd68b303f3f.tar.bz2 opensim-SC_OLD-aa625da6a631e4b7233013a56212ecd68b303f3f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 60cc788..bca49f7 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -1263,7 +1263,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1263 | writer.WriteElementString(name, flagsStr.Replace(",", "")); | 1263 | writer.WriteElementString(name, flagsStr.Replace(",", "")); |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | static void WriteTaskInventory(XmlTextWriter writer, TaskInventoryDictionary tinv, Dictionary<string, object> options, Scene scene) | 1266 | public static void WriteTaskInventory(XmlTextWriter writer, TaskInventoryDictionary tinv, Dictionary<string, object> options, Scene scene) |
1267 | { | 1267 | { |
1268 | if (tinv.Count > 0) // otherwise skip this | 1268 | if (tinv.Count > 0) // otherwise skip this |
1269 | { | 1269 | { |
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1317 | } | 1317 | } |
1318 | } | 1318 | } |
1319 | 1319 | ||
1320 | static void WriteShape(XmlTextWriter writer, PrimitiveBaseShape shp, Dictionary<string, object> options) | 1320 | public static void WriteShape(XmlTextWriter writer, PrimitiveBaseShape shp, Dictionary<string, object> options) |
1321 | { | 1321 | { |
1322 | if (shp != null) | 1322 | if (shp != null) |
1323 | { | 1323 | { |
@@ -1492,7 +1492,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1492 | return obj; | 1492 | return obj; |
1493 | } | 1493 | } |
1494 | 1494 | ||
1495 | static TaskInventoryDictionary ReadTaskInventory(XmlTextReader reader, string name) | 1495 | public static TaskInventoryDictionary ReadTaskInventory(XmlTextReader reader, string name) |
1496 | { | 1496 | { |
1497 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); | 1497 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); |
1498 | 1498 | ||
@@ -1538,7 +1538,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1538 | /// <param name="name">The name of the xml element containing the shape</param> | 1538 | /// <param name="name">The name of the xml element containing the shape</param> |
1539 | /// <param name="errors">true if any errors were encountered during parsing, false otherwise</param> | 1539 | /// <param name="errors">true if any errors were encountered during parsing, false otherwise</param> |
1540 | /// <returns>The shape parsed</returns> | 1540 | /// <returns>The shape parsed</returns> |
1541 | static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors) | 1541 | public static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors) |
1542 | { | 1542 | { |
1543 | errors = false; | 1543 | errors = false; |
1544 | 1544 | ||