aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-05-06 11:47:55 -0700
committerDiva Canto2013-05-06 11:47:55 -0700
commit90f03ccd42a045bb30f33ed866feb38677ed7780 (patch)
treedd8c4ea6c53935cdfcbebe5889aeeb504d53d6c5
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-90f03ccd42a045bb30f33ed866feb38677ed7780.zip
opensim-SC_OLD-90f03ccd42a045bb30f33ed866feb38677ed7780.tar.gz
opensim-SC_OLD-90f03ccd42a045bb30f33ed866feb38677ed7780.tar.bz2
opensim-SC_OLD-90f03ccd42a045bb30f33ed866feb38677ed7780.tar.xz
Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs17
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 355f7b3..ad683b8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -157,6 +157,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
157 availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd); 157 availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd);
158 availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove); 158 availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove);
159 availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList); 159 availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList);
160 availableMethods["admin_estate_reload"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcEstateReload);
160 161
161 // Either enable full remote functionality or just selected features 162 // Either enable full remote functionality or just selected features
162 string enabledMethods = m_config.GetString("enabled_methods", "all"); 163 string enabledMethods = m_config.GetString("enabled_methods", "all");
@@ -1762,6 +1763,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1762 m_log.Info("[RADMIN]: Access List List Request complete"); 1763 m_log.Info("[RADMIN]: Access List List Request complete");
1763 } 1764 }
1764 1765
1766 private void XmlRpcEstateReload(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
1767 {
1768 m_log.Info("[RADMIN]: Received Estate Reload Request");
1769
1770 Hashtable responseData = (Hashtable)response.Value;
1771 Hashtable requestData = (Hashtable)request.Params[0];
1772
1773 m_application.SceneManager.ForEachScene(s =>
1774 s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)
1775 );
1776
1777 responseData["success"] = true;
1778
1779 m_log.Info("[RADMIN]: Estate Reload Request complete");
1780 }
1781
1765 private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) 1782 private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
1766 { 1783 {
1767 Hashtable responseData = (Hashtable)response.Value; 1784 Hashtable responseData = (Hashtable)response.Value;