aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-07-25 17:06:26 +0000
committerDr Scofield2008-07-25 17:06:26 +0000
commitc724e3843399e63c895bd82856496fb3cc64ad57 (patch)
treefb4406882bbcd74a3d97bb6a968006dae8bdffa6
parentfirst cut at a GridInfo plugin (mantis #1825). Currently just spits (diff)
downloadopensim-SC_OLD-c724e3843399e63c895bd82856496fb3cc64ad57.zip
opensim-SC_OLD-c724e3843399e63c895bd82856496fb3cc64ad57.tar.gz
opensim-SC_OLD-c724e3843399e63c895bd82856496fb3cc64ad57.tar.bz2
opensim-SC_OLD-c724e3843399e63c895bd82856496fb3cc64ad57.tar.xz
oops. forgot to add addin.xml for GridInfoPlugin. also, slight
reordering of plugin initialisation to ensure that it will return base information about grid, even if [GridInfo] config section is not there.
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs3
-rw-r--r--bin/GridInfoPlugin.addin.xml11
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs b/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
index d8575d0b..000fa52 100644
--- a/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
+++ b/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
@@ -82,13 +82,14 @@ namespace OpenSim.ApplicationPlugins.GridInfo
82 } 82 }
83 _info["platform"] = "OpenSim"; 83 _info["platform"] = "OpenSim";
84 84
85 _httpd.AddXmlRPCHandler("get_grid_info", XmlRpcGridInfoMethod);
86
85 IConfig gridInfoConfig = _app.ConfigSource.Source.Configs["GridInfo"]; 87 IConfig gridInfoConfig = _app.ConfigSource.Source.Configs["GridInfo"];
86 foreach (string k in gridInfoConfig.GetKeys()) 88 foreach (string k in gridInfoConfig.GetKeys())
87 { 89 {
88 _info[k] = gridInfoConfig.GetString(k); 90 _info[k] = gridInfoConfig.GetString(k);
89 } 91 }
90 92
91 _httpd.AddXmlRPCHandler("get_grid_info", XmlRpcGridInfoMethod);
92 } 93 }
93 catch (NullReferenceException) 94 catch (NullReferenceException)
94 { 95 {
diff --git a/bin/GridInfoPlugin.addin.xml b/bin/GridInfoPlugin.addin.xml
new file mode 100644
index 0000000..ee75817
--- /dev/null
+++ b/bin/GridInfoPlugin.addin.xml
@@ -0,0 +1,11 @@
1<Addin id="OpenSim.ApplicationPlugins.GridInfo" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.ApplicationPlugins.GridInfo.dll"/>
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim" version="0.5" />
7 </Dependencies>
8 <Extension path = "/OpenSim/Startup">
9 <Type type="OpenSim.ApplicationPlugins.GridInfo.GridInfoPlugin" />
10 </Extension>
11</Addin>