diff options
| author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
|---|---|---|
| committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
| commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
| tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/Client | |
| parent | And another merge issue (diff) | |
| parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
| download | opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz | |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index f55d9fc..ccd38d4 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Client.Linden | |||
| 58 | { | 58 | { |
| 59 | if (m_firstScene != null) | 59 | if (m_firstScene != null) |
| 60 | { | 60 | { |
| 61 | return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; | 61 | return m_firstScene.SceneGridService.RegionLoginsEnabled; |
| 62 | } | 62 | } |
| 63 | else | 63 | else |
| 64 | { | 64 | { |
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 4a31e95..fb0aaa5 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Client.Linden | |||
| 62 | { | 62 | { |
| 63 | if (m_firstScene != null) | 63 | if (m_firstScene != null) |
| 64 | { | 64 | { |
| 65 | return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; | 65 | return m_firstScene.SceneGridService.RegionLoginsEnabled; |
| 66 | } | 66 | } |
| 67 | else | 67 | else |
| 68 | { | 68 | { |