OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: stick filename being loaded/saved from in save/load xml/oar information messages

0.6.0-stable
Justin Clarke Casey 2008-07-21 17:52:53 +00:00
parent 8948ecbd8b
commit d9db56d86b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
View File

@ -62,8 +62,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
protected void DearchiveRegion() protected void DearchiveRegion()
{ {
m_log.InfoFormat("[ARCHIVER]: Restoring archive {0}", m_loadPath);
TarArchiveReader archive TarArchiveReader archive
= new TarArchiveReader( = new TarArchiveReader(
new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress)); new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress));

15
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1742,28 +1742,28 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
{ {
m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0} from {1}", RegionInfo.RegionName);
m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset); m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
} }
public void SavePrimsToXml(string fileName) public void SavePrimsToXml(string fileName)
{ {
m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
m_serialiser.SavePrimsToXml(this, fileName); m_serialiser.SavePrimsToXml(this, fileName);
} }
public void LoadPrimsFromXml2(string fileName) public void LoadPrimsFromXml2(string fileName)
{ {
m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
m_serialiser.LoadPrimsFromXml2(this, fileName); m_serialiser.LoadPrimsFromXml2(this, fileName);
} }
public void SavePrimsToXml2(string fileName) public void SavePrimsToXml2(string fileName)
{ {
m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0} to {1}", RegionInfo.RegionName, fileName);
m_serialiser.SavePrimsToXml2(this, fileName); m_serialiser.SavePrimsToXml2(this, fileName);
} }
@ -1771,7 +1771,8 @@ namespace OpenSim.Region.Environment.Scenes
public void SaveNamedPrimsToXml2(string primName, string fileName) public void SaveNamedPrimsToXml2(string primName, string fileName)
{ {
m_log.InfoFormat("[SCENE]: Saving prims with name {0} in xml2 format to region {1}", primName, RegionInfo.RegionName); m_log.InfoFormat(
"[SCENE]: Saving prims with name {0} in xml2 format for region {1} to {2}", primName, RegionInfo.RegionName, fileName);
List<EntityBase> entityList = GetEntities(); List<EntityBase> entityList = GetEntities();
List<EntityBase> primList = new List<EntityBase>(); List<EntityBase> primList = new List<EntityBase>();
@ -1797,7 +1798,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="filePath"></param> /// <param name="filePath"></param>
public void LoadPrimsFromArchive(string filePath) public void LoadPrimsFromArchive(string filePath)
{ {
m_log.InfoFormat("[SCENE]: Loading archive to region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", RegionInfo.RegionName, filePath);
m_archiver.DearchiveRegion(filePath); m_archiver.DearchiveRegion(filePath);
} }
@ -1808,7 +1809,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="filePath"></param> /// <param name="filePath"></param>
public void SavePrimsToArchive(string filePath) public void SavePrimsToArchive(string filePath)
{ {
m_log.InfoFormat("[SCENE]: Writing archive for region {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", RegionInfo.RegionName, filePath);
m_archiver.ArchiveRegion(filePath); m_archiver.ArchiveRegion(filePath);
} }