Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-24 21:10:03 -08:00
commit 06d8f67448
1 changed files with 2 additions and 1 deletions

View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Region
public void AddRegion(Scene scene)
{
m_Scene = scene;
m_DialogModule = m_Scene.RequestModuleInterface<IDialogModule>();
scene.RegisterModuleInterface<IRestartModule>(this);
MainConsole.Instance.Commands.AddCommand("RestartModule",
false, "region restart bluebox",
"region restart bluebox <message> <time> ...",
@ -81,6 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Region
public void RegionLoaded(Scene scene)
{
m_DialogModule = m_Scene.RequestModuleInterface<IDialogModule>();
}
public void RemoveRegion(Scene scene)