Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

slimupdates
Diva Canto 2010-05-04 09:44:56 -07:00
commit 61ce4ca9c7
1 changed files with 14 additions and 0 deletions

View File

@ -646,6 +646,10 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
MainConsole.Instance.Commands.AddCommand("region", false, "reload estate",
"reload estate",
"Reload the estate data", HandleReloadEstate);
//Bind Storage Manager functions to some land manager functions for this scene //Bind Storage Manager functions to some land manager functions for this scene
EventManager.OnLandObjectAdded += EventManager.OnLandObjectAdded +=
new EventManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject); new EventManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject);
@ -5121,5 +5125,15 @@ namespace OpenSim.Region.Framework.Scenes
sun); sun);
} }
} }
private void HandleReloadEstate(string module, string[] cmd)
{
if (MainConsole.Instance.ConsoleScene == null ||
(MainConsole.Instance.ConsoleScene is Scene &&
(Scene)MainConsole.Instance.ConsoleScene == this))
{
ReloadEstateData();
}
}
} }
} }