ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: Making some of the serialization names consistent, both within their pairings and with the others

Browse Source 
* This does make some of the names less ideal than others - this should change in the future
This commit is contained in:
Justin Clarke Casey
2008-06-21 21:20:59 +00:00
parent 91ffb6722f
commit 908d91be78
5 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
View File

@@ -36,8 +36,20 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
{
List<string> SerialiseRegion(Scene scene, string saveDir);
/// <summary>
/// Load prims from the xml format
/// </summary>
/// <param name="scene"></param>
/// <param name="fileName"></param>
/// <param name="newIDS"></param>
/// <param name="loadOffset"></param>
void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset);
/// <summary>
/// Save prims in the xml format
/// </summary>
/// <param name="scene"> </param>
/// <param name="fileName"></param>
void SavePrimsToXml(Scene scene, string fileName);
/// <summary>
@@ -54,10 +66,25 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
/// <param name="reader"></param>
void LoadPrimsFromXml2(Scene scene, TextReader reader);
/// <summary>
/// Save prims in the xml2 format
/// </summary>
/// <param name="scene"></param>
/// <param name="fileName"></param>
void SavePrimsToXml2(Scene scene, string fileName);
void LoadGroupFromXml2String(Scene scene, string xmlString);
/// <summary>
/// Load an individual scene object from the xml2 format
/// </summary>
/// <param name="scene"></param>
/// <param name="xmlString"></param>
void LoadGroupFromXml2(Scene scene, string xmlString);
string SavePrimGroupToXML2String(SceneObjectGroup grp);
/// <summary>
/// Serialize an individual scene object into the xml2 format
/// </summary>
/// <param name="grp"></param>
/// <returns></returns>
string SaveGroupToXml2(SceneObjectGroup grp);
}
}

4
OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
View File

@@ -99,12 +99,12 @@ namespace OpenSim.Region.Environment.Scenes
file.Close();
}
public static string SavePrimGroupToXML2String(SceneObjectGroup grp)
public static string SaveGroupToXml2(SceneObjectGroup grp)
{
return grp.ToXmlString2();
}
public static void LoadGroupFromXml2String(Scene scene, string xmlString)
public static void LoadGroupFromXml2(Scene scene, string xmlString)
{
XmlDocument doc = new XmlDocument();
XmlNode rootNode;

8
OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
View File

@@ -112,14 +112,14 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
SceneXmlLoader.SavePrimsToXml2(scene, fileName);
}
public void LoadGroupFromXml2String(Scene scene, string xmlString)
public void LoadGroupFromXml2(Scene scene, string xmlString)
{
SceneXmlLoader.LoadGroupFromXml2String(scene, xmlString);
SceneXmlLoader.LoadGroupFromXml2(scene, xmlString);
}
public string SavePrimGroupToXML2String(SceneObjectGroup grp)
public string SaveGroupToXml2(SceneObjectGroup grp)
{
return SceneXmlLoader.SavePrimGroupToXML2String(grp);
return SceneXmlLoader.SaveGroupToXml2(grp);
}
public List<string> SerialiseRegion(Scene scene, string saveDir)