Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-16 23:08:47 +00:00
5 changed files with 24 additions and 194 deletions

View File

@@ -254,8 +254,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
// Will need some controls around this
m_scene.LoginsDisabled = true;
m_scene.LoginLock = true;
RRAlert("loading oar");
RRAlert("disabled");
if ( m_uri != string.Empty )
{
RRAlert("loading oar");
RRAlert("disabled");
}
}
}