diff options
| author | Melanie | 2009-09-27 21:25:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-27 21:25:10 +0100 |
| commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
| tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /OpenSim/Client | |
| parent | Add the Migration for the regions table (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
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 | { |