diff options
author | Melanie | 2013-05-06 23:47:19 +0100 |
---|---|---|
committer | Melanie | 2013-05-06 23:47:19 +0100 |
commit | b36e123c7f159b6c97a5ecb03e113c0de8083879 (patch) | |
tree | 5aa79fe958adfc44929b25e86c2a72a46dd49422 /OpenSim/ApplicationPlugins | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: remove friction calcuation from BSMotor and move linear and (diff) | |
download | opensim-SC_OLD-b36e123c7f159b6c97a5ecb03e113c0de8083879.zip opensim-SC_OLD-b36e123c7f159b6c97a5ecb03e113c0de8083879.tar.gz opensim-SC_OLD-b36e123c7f159b6c97a5ecb03e113c0de8083879.tar.bz2 opensim-SC_OLD-b36e123c7f159b6c97a5ecb03e113c0de8083879.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index c2fa1ed..50d8a73 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -161,6 +161,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
161 | availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd); | 161 | availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd); |
162 | availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove); | 162 | availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove); |
163 | availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList); | 163 | availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList); |
164 | availableMethods["admin_estate_reload"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcEstateReload); | ||
164 | 165 | ||
165 | // Misc | 166 | // Misc |
166 | availableMethods["admin_refresh_search"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRefreshSearch); | 167 | availableMethods["admin_refresh_search"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRefreshSearch); |
@@ -1903,6 +1904,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1903 | m_log.Info("[RADMIN]: Access List List Request complete"); | 1904 | m_log.Info("[RADMIN]: Access List List Request complete"); |
1904 | } | 1905 | } |
1905 | 1906 | ||
1907 | private void XmlRpcEstateReload(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) | ||
1908 | { | ||
1909 | m_log.Info("[RADMIN]: Received Estate Reload Request"); | ||
1910 | |||
1911 | Hashtable responseData = (Hashtable)response.Value; | ||
1912 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
1913 | |||
1914 | m_application.SceneManager.ForEachScene(s => | ||
1915 | s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false) | ||
1916 | ); | ||
1917 | |||
1918 | responseData["success"] = true; | ||
1919 | |||
1920 | m_log.Info("[RADMIN]: Estate Reload Request complete"); | ||
1921 | } | ||
1922 | |||
1906 | private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) | 1923 | private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) |
1907 | { | 1924 | { |
1908 | Hashtable responseData = (Hashtable)response.Value; | 1925 | Hashtable responseData = (Hashtable)response.Value; |