ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor: Remove some serialization module scene wrappers

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-12-19 19:35:14 +00:00
parent 667a935fff
commit e62016d2c7
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1880,34 +1880,6 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
public void LoadPrimsFromXml2(string fileName)
{
m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
m_serialiser.LoadPrimsFromXml2(this, fileName);
}
public void LoadPrimsFromXml2(TextReader reader, bool startScripts)
{
m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from stream", RegionInfo.RegionName);
m_serialiser.LoadPrimsFromXml2(this, reader, startScripts);
}
public void SavePrimsToXml2(string fileName)
{
m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
m_serialiser.SavePrimsToXml2(this, fileName);
}
public void SavePrimsToXml2(TextWriter stream, Vector3 min, Vector3 max)
{
m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to stream", RegionInfo.RegionName);
m_serialiser.SavePrimsToXml2(this, stream, min, max);
}
public void SaveNamedPrimsToXml2(string primName, string fileName)
{
m_log.InfoFormat(

8
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@@ -208,7 +208,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="filename"></param>
public void SaveCurrentSceneToXml2(string filename)
{
CurrentOrFirstScene.SavePrimsToXml2(filename);
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
if (serialiser != null)
serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
}
public void SaveNamedPrimsToXml2(string primName, string filename)
@@ -221,7 +223,9 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public void LoadCurrentSceneFromXml2(string filename)
{
CurrentOrFirstScene.LoadPrimsFromXml2(filename);
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
if (serialiser != null)
serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
}
/// <summary>