aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs28
1 files changed, 12 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 26f3499..6916c6d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -121,6 +121,8 @@ namespace OpenSim.Region.Environment.Scenes
121 protected IWorldComm m_worldCommModule; 121 protected IWorldComm m_worldCommModule;
122 protected IAvatarFactory m_AvatarFactory; 122 protected IAvatarFactory m_AvatarFactory;
123 protected IConfigSource m_config; 123 protected IConfigSource m_config;
124 protected IRegionArchiver m_archiver;
125 protected IRegionSerialiser m_serialiser;
124 126
125 // Central Update Loop 127 // Central Update Loop
126 128
@@ -643,6 +645,8 @@ namespace OpenSim.Region.Environment.Scenes
643 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 645 m_worldCommModule = RequestModuleInterface<IWorldComm>();
644 XferManager = RequestModuleInterface<IXfer>(); 646 XferManager = RequestModuleInterface<IXfer>();
645 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); 647 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
648 m_archiver = RequestModuleInterface<IRegionArchiver>();
649 m_serialiser = RequestModuleInterface<IRegionSerialiser>();
646 } 650 }
647 651
648 #endregion 652 #endregion
@@ -1398,26 +1402,22 @@ namespace OpenSim.Region.Environment.Scenes
1398 1402
1399 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) 1403 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
1400 { 1404 {
1401 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>(); 1405 m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
1402 loader.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
1403 } 1406 }
1404 1407
1405 public void SavePrimsToXml(string fileName) 1408 public void SavePrimsToXml(string fileName)
1406 { 1409 {
1407 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>(); 1410 m_serialiser.SavePrimsToXml(this, fileName);
1408 loader.SavePrimsToXml(this, fileName);
1409 } 1411 }
1410 1412
1411 public void LoadPrimsFromXml2(string fileName) 1413 public void LoadPrimsFromXml2(string fileName)
1412 { 1414 {
1413 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>(); 1415 m_serialiser.LoadPrimsFromXml2(this, fileName);
1414 loader.LoadPrimsFromXml2(this, fileName);
1415 } 1416 }
1416 1417
1417 public void SavePrimsToXml2(string fileName) 1418 public void SavePrimsToXml2(string fileName)
1418 { 1419 {
1419 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>(); 1420 m_serialiser.SavePrimsToXml2(this, fileName);
1420 loader.SavePrimsToXml2(this, fileName);
1421 } 1421 }
1422 1422
1423 /// <summary> 1423 /// <summary>
@@ -1426,8 +1426,7 @@ namespace OpenSim.Region.Environment.Scenes
1426 /// <param name="filePath"></param> 1426 /// <param name="filePath"></param>
1427 public void LoadPrimsFromArchive(string filePath) 1427 public void LoadPrimsFromArchive(string filePath)
1428 { 1428 {
1429 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); 1429 m_archiver.DearchiveRegion(filePath);
1430 archiver.DearchiveRegion(filePath);
1431 } 1430 }
1432 1431
1433 /// <summary> 1432 /// <summary>
@@ -1436,8 +1435,7 @@ namespace OpenSim.Region.Environment.Scenes
1436 /// <param name="filePath"></param> 1435 /// <param name="filePath"></param>
1437 public void SavePrimsToArchive(string filePath) 1436 public void SavePrimsToArchive(string filePath)
1438 { 1437 {
1439 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); 1438 m_archiver.ArchiveRegion(filePath);
1440 archiver.ArchiveRegion(filePath);
1441 } 1439 }
1442 1440
1443 /// <summary> 1441 /// <summary>
@@ -1516,10 +1514,9 @@ namespace OpenSim.Region.Environment.Scenes
1516 { 1514 {
1517 bool successYN = false; 1515 bool successYN = false;
1518 1516
1519 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
1520 successYN 1517 successYN
1521 = m_sceneGridService.PrimCrossToNeighboringRegion( 1518 = m_sceneGridService.PrimCrossToNeighboringRegion(
1522 newRegionHandle, grp.UUID, loader.SavePrimGroupToXML2String(grp), primcrossingXMLmethod); 1519 newRegionHandle, grp.UUID, m_serialiser.SavePrimGroupToXML2String(grp), primcrossingXMLmethod);
1523 1520
1524 if (successYN) 1521 if (successYN)
1525 { 1522 {
@@ -1552,8 +1549,7 @@ namespace OpenSim.Region.Environment.Scenes
1552 m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); 1549 m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor");
1553 if (XMLMethod == 0) 1550 if (XMLMethod == 0)
1554 { 1551 {
1555 IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>(); 1552 m_serialiser.LoadGroupFromXml2String(this, objXMLData);
1556 loader.LoadGroupFromXml2String(this, objXMLData);
1557 1553
1558 SceneObjectPart RootPrim = GetSceneObjectPart(primID); 1554 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
1559 if (RootPrim != null) 1555 if (RootPrim != null)