aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-21 21:20:59 +0000
committerJustin Clarke Casey2008-06-21 21:20:59 +0000
commit908d91be78038832945eec5c4d05c71ab64e3680 (patch)
treed7274271c36fa557c0b22833e614e2e122922d6c /OpenSim/Region/Environment/Scenes
parent* Remove redundant <scene> tag from individual object xml representation (diff)
downloadopensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.zip
opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.gz
opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.bz2
opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.xz
* refactor: Making some of the serialization names consistent, both within their pairings and with the others
* This does make some of the names less ideal than others - this should change in the future
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4cf1ea4..69981e2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1821,7 +1821,7 @@ namespace OpenSim.Region.Environment.Scenes
1821 1821
1822 successYN 1822 successYN
1823 = m_sceneGridService.PrimCrossToNeighboringRegion( 1823 = m_sceneGridService.PrimCrossToNeighboringRegion(
1824 newRegionHandle, grp.UUID, m_serialiser.SavePrimGroupToXML2String(grp), primcrossingXMLmethod); 1824 newRegionHandle, grp.UUID, m_serialiser.SaveGroupToXml2(grp), primcrossingXMLmethod);
1825 1825
1826 if (successYN) 1826 if (successYN)
1827 { 1827 {
@@ -1854,7 +1854,7 @@ namespace OpenSim.Region.Environment.Scenes
1854 m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); 1854 m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor");
1855 if (XMLMethod == 0) 1855 if (XMLMethod == 0)
1856 { 1856 {
1857 m_serialiser.LoadGroupFromXml2String(this, objXMLData); 1857 m_serialiser.LoadGroupFromXml2(this, objXMLData);
1858 1858
1859 SceneObjectPart RootPrim = GetSceneObjectPart(primID); 1859 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
1860 if (RootPrim != null) 1860 if (RootPrim != null)