aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-10-13 18:41:52 +0100
committerMelanie2010-10-13 18:41:52 +0100
commiteeac2a9e6a835ae8e1fcbe2d55d040b207091fb2 (patch)
tree754765e8f4f47ccb3f74c6b1ba2a5845ab9aa861 /OpenSim
parentCorrectly update the LastSeen field (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-eeac2a9e6a835ae8e1fcbe2d55d040b207091fb2.zip
opensim-SC_OLD-eeac2a9e6a835ae8e1fcbe2d55d040b207091fb2.tar.gz
opensim-SC_OLD-eeac2a9e6a835ae8e1fcbe2d55d040b207091fb2.tar.bz2
opensim-SC_OLD-eeac2a9e6a835ae8e1fcbe2d55d040b207091fb2.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
-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 2c6d999..3fd61da 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1533,7 +1533,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1533 } 1533 }
1534 else 1534 else
1535 { 1535 {
1536 m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName); 1536 //m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName);
1537 reader.ReadOuterXml(); // ignore 1537 reader.ReadOuterXml(); // ignore
1538 } 1538 }
1539 1539