From 03f246d6fea009f1812019f5f036987b96b47a2b Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Thu, 18 Sep 2008 15:44:05 +0000
Subject: adds support to delete a region completely and offers that
 functionality via the console command "delete-region" and also via
 RemoteAdminPlugin.

minor typo fix.



---
 OpenSim/Region/Application/OpenSim.cs | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region/Application/OpenSim.cs')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index e48df81..9f313eb 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -311,22 +311,23 @@ namespace OpenSim
                     break;
 
                 case "remove-region":
-                    string regName = CombineParams(cmdparams, 0);
+                    string regRemoveName = CombineParams(cmdparams, 0);
 
-                    Scene killScene;
-                    if (m_sceneManager.TryGetScene(regName, out killScene))
-                    {
-                        // only need to check this if we are not at the
-                        // root level
-                        if ((m_sceneManager.CurrentScene != null) &&
-                            (m_sceneManager.CurrentScene.RegionInfo.RegionID == killScene.RegionInfo.RegionID))
-                        {
-                            m_sceneManager.TrySetCurrentScene("..");
-                        }
+                    Scene removeScene;
+                    if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
+                        RemoveRegion(removeScene, false);
+                    else
+                        m_console.Error("no region with that name");
+                    break;
 
-                        m_regionData.Remove(killScene.RegionInfo);
-                        m_sceneManager.CloseScene(killScene);
-                    }
+                case "delete-region":
+                    string regDeleteName = CombineParams(cmdparams, 0);
+
+                    Scene killScene;
+                    if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
+                        RemoveRegion(killScene, true);
+                    else
+                        m_console.Error("no region with that name");
                     break;
 
                 case "restart":
@@ -610,6 +611,7 @@ namespace OpenSim
             m_console.Notice("force-update - force an update of prims in the scene");
             m_console.Notice("restart - disconnects all clients and restarts the sims in the instance.");
             m_console.Notice("remove-region [name] - remove a region");
+            m_console.Notice("delete-region [name] - delete a region");
             m_console.Notice("load-xml [filename] - load prims from XML (DEPRECATED)");
             m_console.Notice("save-xml [filename] - save prims to XML (DEPRECATED)");
             m_console.Notice("save-xml2 [filename] - save prims to XML using version 2 format");
-- 
cgit v1.1