OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-25 08:39:09 -07:00
parent 295868033f
commit 902279f0fd
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Client/Linden/LLProxyLoginModule.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Client.Linden
{ {
if (m_firstScene != null) if (m_firstScene != null)
{ {
return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; return m_firstScene.SceneGridService.RegionLoginsEnabled;
} }
else else
{ {

2
OpenSim/Client/Linden/LLStandaloneLoginModule.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Client.Linden
{ {
if (m_firstScene != null) if (m_firstScene != null)
{ {
return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; return m_firstScene.SceneGridService.RegionLoginsEnabled;
} }
else else
{ {

2
OpenSim/Region/Application/OpenSim.cs
View File

@ -557,7 +557,7 @@ namespace OpenSim
/// <param name="cmd"></param> /// <param name="cmd"></param>
private void HandleLoginStatus(string module, string[] cmd) private void HandleLoginStatus(string module, string[] cmd)
{ {
if (m_commsManager.GridService.RegionLoginsEnabled == false) if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
m_log.Info("[ Login ] Login are disabled "); m_log.Info("[ Login ] Login are disabled ");
else else

8
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -209,9 +209,9 @@ namespace OpenSim
} }
// Only enable logins to the regions once we have completely finished starting up (apart from scripts) // Only enable logins to the regions once we have completely finished starting up (apart from scripts)
if ((m_commsManager != null) && (m_commsManager.GridService != null)) if ((SceneManager.CurrentOrFirstScene != null) && (SceneManager.CurrentOrFirstScene.SceneGridService != null))
{ {
m_commsManager.GridService.RegionLoginsEnabled = true; SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
} }
AddPluginCommands(); AddPluginCommands();
@ -299,12 +299,12 @@ namespace OpenSim
if (LoginEnabled) if (LoginEnabled)
{ {
m_log.Info("[LOGIN]: Login is now enabled."); m_log.Info("[LOGIN]: Login is now enabled.");
m_commsManager.GridService.RegionLoginsEnabled = true; SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
} }
else else
{ {
m_log.Info("[LOGIN]: Login is now disabled."); m_log.Info("[LOGIN]: Login is now disabled.");
m_commsManager.GridService.RegionLoginsEnabled = false; SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = false;
} }
} }

2
OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
{ {
if (m_firstScene != null) if (m_firstScene != null)
{ {
return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; return m_firstScene.SceneGridService.RegionLoginsEnabled;
} }
else else
{ {

7
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -63,6 +63,13 @@ namespace OpenSim.Region.Framework.Scenes
protected List<UUID> m_agentsInTransit; protected List<UUID> m_agentsInTransit;
public bool RegionLoginsEnabled
{
get { return m_regionLoginsEnabled; }
set { m_regionLoginsEnabled = value; }
}
private bool m_regionLoginsEnabled = false;
/// <summary> /// <summary>
/// An agent is crossing into this region /// An agent is crossing into this region
/// </summary> /// </summary>