minor: Remove some serialization module scene wrappers

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

View File

@@ -44,6 +44,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.ApplicationPlugins.Rest;
@@ -219,7 +220,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
{
httpResponse.SendChunked = true;
httpResponse.ContentType = "text/xml";
scene.SavePrimsToXml2(new StreamWriter(httpResponse.OutputStream), min, max);
IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
if (serialiser != null)
serialiser.SavePrimsToXml2(scene, new StreamWriter(httpResponse.OutputStream), min, max);
return "";
}
}

View File

@@ -44,6 +44,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.ApplicationPlugins.Rest;
@@ -120,7 +121,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
public string LoadPrims(string requestBody, OSHttpRequest request, OSHttpResponse response, Scene scene)
{
scene.LoadPrimsFromXml2(new StringReader(requestBody), true);
IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
if (serialiser != null)
serialiser.LoadPrimsFromXml2(scene, new StringReader(requestBody), true);
return "";
}