aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs9
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs8
2 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index fa5f117..aeb91a9 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -57,6 +57,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
57 public partial class RestRegionPlugin : RestPlugin 57 public partial class RestRegionPlugin : RestPlugin
58 { 58 {
59 private static XmlSerializerNamespaces _xmlNs; 59 private static XmlSerializerNamespaces _xmlNs;
60
61 static RestRegionPlugin()
62 {
63 _xmlNs = new XmlSerializerNamespaces();
64 _xmlNs.Add(String.Empty, String.Empty);
65 }
60 66
61 #region overriding properties 67 #region overriding properties
62 public override string Name 68 public override string Name
@@ -91,9 +97,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
91 } 97 }
92 m_log.InfoFormat("{0} REST region plugin enabled", MsgID); 98 m_log.InfoFormat("{0} REST region plugin enabled", MsgID);
93 99
94 _xmlNs = new XmlSerializerNamespaces();
95 _xmlNs.Add(String.Empty, String.Empty);
96
97 // add REST method handlers 100 // add REST method handlers
98 AddRestStreamHandler("GET", "/regions/", GetHandler); 101 AddRestStreamHandler("GET", "/regions/", GetHandler);
99 AddRestStreamHandler("POST", "/regions/", PostHandler); 102 AddRestStreamHandler("POST", "/regions/", PostHandler);
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 8373ea2..ffabb2a 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -136,6 +136,14 @@ namespace OpenSim.ApplicationPlugins.Rest
136 } 136 }
137 137
138 /// <summary> 138 /// <summary>
139 /// Access to GOD password string
140 /// </summary>
141 protected string GodKey
142 {
143 get { return _godkey; }
144 }
145
146 /// <summary>
139 /// Configuration of the plugin 147 /// Configuration of the plugin
140 /// </summary> 148 /// </summary>
141 public IConfig Config 149 public IConfig Config