diff options
author | Charles Krinke | 2009-07-08 20:53:22 +0000 |
---|---|---|
committer | Charles Krinke | 2009-07-08 20:53:22 +0000 |
commit | 525ab2c2780d093e6f72d2054dca998620dd4629 (patch) | |
tree | 60fafa5cf6e309c096b33df3ecb44c3460ebc950 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC-525ab2c2780d093e6f72d2054dca998620dd4629.zip opensim-SC-525ab2c2780d093e6f72d2054dca998620dd4629.tar.gz opensim-SC-525ab2c2780d093e6f72d2054dca998620dd4629.tar.bz2 opensim-SC-525ab2c2780d093e6f72d2054dca998620dd4629.tar.xz |
Thank you kindly, RandomHuman for a patch that:
The admin_close_region method removes a region from the simulator without deleting it.
The region can then be recreated by calling admin_create_region with the same UUID.
There is also a change to admin_create_region to facilitate this.The reason I want
to have this functionality is to make it possible to detach regions when they are
idle and recreate them on demand through a web interface. It's probably doable
using the existing methods by saving and loading oars, but it also doesn't seem
like that should be necessary.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 23b1cc9..9950534 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -107,6 +107,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
107 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); | 107 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); |
108 | availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod; | 108 | availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod; |
109 | availableMethods["admin_delete_region"] = XmlRpcDeleteRegionMethod; | 109 | availableMethods["admin_delete_region"] = XmlRpcDeleteRegionMethod; |
110 | availableMethods["admin_close_region"] = XmlRpcCloseRegionMethod; | ||
110 | availableMethods["admin_modify_region"] = XmlRpcModifyRegionMethod; | 111 | availableMethods["admin_modify_region"] = XmlRpcModifyRegionMethod; |
111 | availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod; | 112 | availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod; |
112 | availableMethods["admin_shutdown"] = XmlRpcShutdownMethod; | 113 | availableMethods["admin_shutdown"] = XmlRpcShutdownMethod; |
@@ -507,6 +508,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
507 | RegionInfo region = new RegionInfo(); | 508 | RegionInfo region = new RegionInfo(); |
508 | 509 | ||
509 | region.RegionID = regionID; | 510 | region.RegionID = regionID; |
511 | region.originRegionID = regionID; | ||
510 | region.RegionName = (string) requestData["region_name"]; | 512 | region.RegionName = (string) requestData["region_name"]; |
511 | region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); | 513 | region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); |
512 | region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); | 514 | region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); |
@@ -735,6 +737,98 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
735 | return response; | 737 | return response; |
736 | } | 738 | } |
737 | } | 739 | } |
740 | |||
741 | /// <summary> | ||
742 | /// Close a region. | ||
743 | /// <summary> | ||
744 | /// <param name="request">incoming XML RPC request</param> | ||
745 | /// <remarks> | ||
746 | /// XmlRpcCloseRegionMethod takes the following XMLRPC | ||
747 | /// parameters | ||
748 | /// <list type="table"> | ||
749 | /// <listheader><term>parameter name</term><description>description</description></listheader> | ||
750 | /// <item><term>password</term> | ||
751 | /// <description>admin password as set in OpenSim.ini</description></item> | ||
752 | /// <item><term>region_name</term> | ||
753 | /// <description>desired region name</description></item> | ||
754 | /// <item><term>region_id</term> | ||
755 | /// <description>(optional) desired region UUID</description></item> | ||
756 | /// </list> | ||
757 | /// | ||
758 | /// XmlRpcShutdownRegionMethod returns | ||
759 | /// <list type="table"> | ||
760 | /// <listheader><term>name</term><description>description</description></listheader> | ||
761 | /// <item><term>success</term> | ||
762 | /// <description>true or false</description></item> | ||
763 | /// <item><term>region_name</term> | ||
764 | /// <description>the region name if success is true</description></item> | ||
765 | /// <item><term>error</term> | ||
766 | /// <description>error message if success is false</description></item> | ||
767 | /// </list> | ||
768 | /// </remarks> | ||
769 | public XmlRpcResponse XmlRpcCloseRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) | ||
770 | { | ||
771 | m_log.Info("[RADMIN]: CloseRegion: new request"); | ||
772 | XmlRpcResponse response = new XmlRpcResponse(); | ||
773 | Hashtable responseData = new Hashtable(); | ||
774 | Scene scene = null; | ||
775 | |||
776 | lock (rslock) | ||
777 | { | ||
778 | try | ||
779 | { | ||
780 | Hashtable requestData = (Hashtable) request.Params[0]; | ||
781 | checkStringParameters(request, new string[] {"password"}); | ||
782 | |||
783 | if (requestData.ContainsKey("region_id") && | ||
784 | !String.IsNullOrEmpty((string) requestData["region_id"])) | ||
785 | { | ||
786 | // Region specified by UUID | ||
787 | UUID regionID = (UUID) (string) requestData["region_id"]; | ||
788 | if (!m_app.SceneManager.TryGetScene(regionID, out scene)) | ||
789 | throw new Exception(String.Format("region \"{0}\" does not exist", regionID)); | ||
790 | |||
791 | m_app.CloseRegion(scene); | ||
792 | |||
793 | responseData["success"] = true; | ||
794 | responseData["region_id"] = regionID; | ||
795 | |||
796 | response.Value = responseData; | ||
797 | } | ||
798 | else if (requestData.ContainsKey("region_name") && | ||
799 | !String.IsNullOrEmpty((string) requestData["region_name"])) | ||
800 | { | ||
801 | // Region specified by name | ||
802 | |||
803 | string regionName = (string) requestData["region_name"]; | ||
804 | if (!m_app.SceneManager.TryGetScene(regionName, out scene)) | ||
805 | throw new Exception(String.Format("region \"{0}\" does not exist", regionName)); | ||
806 | |||
807 | m_app.CloseRegion(scene); | ||
808 | |||
809 | responseData["success"] = true; | ||
810 | responseData["region_name"] = regionName; | ||
811 | |||
812 | response.Value = responseData; | ||
813 | } | ||
814 | else | ||
815 | throw new Exception("no region specified"); | ||
816 | } | ||
817 | catch (Exception e) | ||
818 | { | ||
819 | m_log.ErrorFormat("[RADMIN] CloseRegion: failed {0}", e.Message); | ||
820 | m_log.DebugFormat("[RADMIN] CloseRegion: failed {0}", e.ToString()); | ||
821 | |||
822 | responseData["success"] = false; | ||
823 | responseData["error"] = e.Message; | ||
824 | |||
825 | response.Value = responseData; | ||
826 | } | ||
827 | |||
828 | m_log.Info("[RADMIN]: CloseRegion: request complete"); | ||
829 | return response; | ||
830 | } | ||
831 | } | ||
738 | 832 | ||
739 | /// <summary> | 833 | /// <summary> |
740 | /// Change characteristics of an existing region. | 834 | /// Change characteristics of an existing region. |