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/Region/CoreModules/Hypergrid | |
| 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/Region/CoreModules/Hypergrid')
| -rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs index 613dbe9..4199c98 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
| 61 | { | 61 | { |
| 62 | if (m_firstScene != null) | 62 | if (m_firstScene != null) |
| 63 | { | 63 | { |
| 64 | return m_firstScene.CommsManager.GridService.RegionLoginsEnabled; | 64 | return m_firstScene.SceneGridService.RegionLoginsEnabled; |
| 65 | } | 65 | } |
| 66 | else | 66 | else |
| 67 | { | 67 | { |