aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-07-14 14:40:39 +0000
committerDr Scofield2008-07-14 14:40:39 +0000
commit31e5d348f6446571abe9d6d5ca5f5e350b6c6ab0 (patch)
tree398bf986ab8ade9f58de7f2129d680f6ea8aff2a
parentMantis#1739. Thank you kindly, Grumly57 for a patch that: (diff)
downloadopensim-SC_OLD-31e5d348f6446571abe9d6d5ca5f5e350b6c6ab0.zip
opensim-SC_OLD-31e5d348f6446571abe9d6d5ca5f5e350b6c6ab0.tar.gz
opensim-SC_OLD-31e5d348f6446571abe9d6d5ca5f5e350b6c6ab0.tar.bz2
opensim-SC_OLD-31e5d348f6446571abe9d6d5ca5f5e350b6c6ab0.tar.xz
adding support for Xml2 serialization format to XmlRpcLoadXMLMethod.
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs21
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 0a58a0a..d61e566 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -712,7 +712,26 @@ namespace OpenSim.ApplicationPlugins.RemoteController
712 712
713 responseData["switched"] = "true"; 713 responseData["switched"] = "true";
714 714
715 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0)); 715 string xml_version = "1";
716 if (requestData.Contains("xml_version"))
717 {
718 xml_version = (string)requestData["xml_version"];
719 }
720
721 switch (xml_version)
722 {
723 case "1":
724 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0));
725 break;
726
727 case "2":
728 m_app.SceneManager.LoadCurrentSceneFromXml2(filename);
729 break;
730
731 default:
732 throw new Exception(String.Format("unknown Xml{0} format", xml_version));
733 }
734
716 responseData["loaded"] = "true"; 735 responseData["loaded"] = "true";
717 736
718 response.Value = responseData; 737 response.Value = responseData;