aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorDr Scofield2008-09-18 15:44:05 +0000
committerDr Scofield2008-09-18 15:44:05 +0000
commit03f246d6fea009f1812019f5f036987b96b47a2b (patch)
treef7194082d70c68a4cb64e92036d6613518fbd89c /OpenSim/Region/Environment
parentadd some comments and some try blocks around object storage (diff)
downloadopensim-SC_OLD-03f246d6fea009f1812019f5f036987b96b47a2b.zip
opensim-SC_OLD-03f246d6fea009f1812019f5f036987b96b47a2b.tar.gz
opensim-SC_OLD-03f246d6fea009f1812019f5f036987b96b47a2b.tar.bz2
opensim-SC_OLD-03f246d6fea009f1812019f5f036987b96b47a2b.tar.xz
adds support to delete a region completely and offers that
functionality via the console command "delete-region" and also via RemoteAdminPlugin. minor typo fix.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8ee2179..88f2928 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -624,7 +624,7 @@ namespace OpenSim.Region.Environment.Scenes
624 // close the inner scene 624 // close the inner scene
625 m_innerScene.Close(); 625 m_innerScene.Close();
626 // De-register with region communications (events cleanup) 626 // De-register with region communications (events cleanup)
627 UnRegisterReginWithComms(); 627 UnRegisterRegionWithComms();
628 628
629 // Shut down all non shared modules. 629 // Shut down all non shared modules.
630 foreach (IRegionModule module in Modules.Values) 630 foreach (IRegionModule module in Modules.Values)
@@ -1775,10 +1775,9 @@ namespace OpenSim.Region.Environment.Scenes
1775 /// <returns>true if the object was in the scene, false if it was not</returns> 1775 /// <returns>true if the object was in the scene, false if it was not</returns>
1776 public bool UnlinkSceneObject(UUID uuid, bool resultOfLinkingObjects) 1776 public bool UnlinkSceneObject(UUID uuid, bool resultOfLinkingObjects)
1777 { 1777 {
1778 if (m_innerScene.DeleteSceneObject(uuid,resultOfLinkingObjects)) 1778 if (m_innerScene.DeleteSceneObject(uuid, resultOfLinkingObjects))
1779 { 1779 {
1780 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); 1780 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
1781
1782 return true; 1781 return true;
1783 } 1782 }
1784 1783
@@ -2568,7 +2567,7 @@ namespace OpenSim.Region.Environment.Scenes
2568 /// <summary> 2567 /// <summary>
2569 /// 2568 ///
2570 /// </summary> 2569 /// </summary>
2571 public void UnRegisterReginWithComms() 2570 public void UnRegisterRegionWithComms()
2572 { 2571 {
2573 m_sceneGridService.KiPrimitive -= SendKiPrimitive; 2572 m_sceneGridService.KiPrimitive -= SendKiPrimitive;
2574 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 2573 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;