aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-05-04 09:44:56 -0700
committerDiva Canto2010-05-04 09:44:56 -0700
commit61ce4ca9c77c259601445e4d53296b26849e8636 (patch)
treed1baa6d31fc88fb58690f3d92eab932800d0c1fb /OpenSim
parentFixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside... (diff)
parentAdd "reload estate" command to sims (diff)
downloadopensim-SC_OLD-61ce4ca9c77c259601445e4d53296b26849e8636.zip
opensim-SC_OLD-61ce4ca9c77c259601445e4d53296b26849e8636.tar.gz
opensim-SC_OLD-61ce4ca9c77c259601445e4d53296b26849e8636.tar.bz2
opensim-SC_OLD-61ce4ca9c77c259601445e4d53296b26849e8636.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index da18629..1a46837 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -646,6 +646,10 @@ namespace OpenSim.Region.Framework.Scenes
646 } 646 }
647 } 647 }
648 648
649 MainConsole.Instance.Commands.AddCommand("region", false, "reload estate",
650 "reload estate",
651 "Reload the estate data", HandleReloadEstate);
652
649 //Bind Storage Manager functions to some land manager functions for this scene 653 //Bind Storage Manager functions to some land manager functions for this scene
650 EventManager.OnLandObjectAdded += 654 EventManager.OnLandObjectAdded +=
651 new EventManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject); 655 new EventManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject);
@@ -5121,5 +5125,15 @@ namespace OpenSim.Region.Framework.Scenes
5121 sun); 5125 sun);
5122 } 5126 }
5123 } 5127 }
5128
5129 private void HandleReloadEstate(string module, string[] cmd)
5130 {
5131 if (MainConsole.Instance.ConsoleScene == null ||
5132 (MainConsole.Instance.ConsoleScene is Scene &&
5133 (Scene)MainConsole.Instance.ConsoleScene == this))
5134 {
5135 ReloadEstateData();
5136 }
5137 }
5124 } 5138 }
5125} 5139}