diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs index fb4d04f..f3c8aa8 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
52 | protected List<Scene> m_Scenes = new List<Scene>(); | 52 | protected List<Scene> m_Scenes = new List<Scene>(); |
53 | protected bool m_InInfoUpdate = false; | 53 | protected bool m_InInfoUpdate = false; |
54 | private string token = "7db8eh2gvgg45jj"; | 54 | private string token = "7db8eh2gvgg45jj"; |
55 | protected bool m_enabled = false; | 55 | protected bool m_enabled = false; |
56 | 56 | ||
57 | public bool InInfoUpdate | 57 | public bool InInfoUpdate |
58 | { | 58 | { |
@@ -74,19 +74,19 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
74 | IConfig estateConfig = config.Configs["Estates"]; | 74 | IConfig estateConfig = config.Configs["Estates"]; |
75 | if (estateConfig != null) | 75 | if (estateConfig != null) |
76 | { | 76 | { |
77 | if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name) | 77 | if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name) |
78 | m_enabled = true; | 78 | m_enabled = true; |
79 | else | 79 | else |
80 | return; | 80 | return; |
81 | 81 | ||
82 | port = (uint)estateConfig.GetInt("Port", 0); | 82 | port = (uint)estateConfig.GetInt("Port", 0); |
83 | // this will need to came from somewhere else | 83 | // this will need to came from somewhere else |
84 | token = estateConfig.GetString("Token", token); | 84 | token = estateConfig.GetString("Token", token); |
85 | } | 85 | } |
86 | else | 86 | else |
87 | { | 87 | { |
88 | m_enabled = true; | 88 | m_enabled = true; |
89 | } | 89 | } |
90 | 90 | ||
91 | m_EstateConnector = new EstateConnector(this, token, port); | 91 | m_EstateConnector = new EstateConnector(this, token, port); |
92 | 92 | ||
@@ -108,8 +108,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
108 | 108 | ||
109 | public void AddRegion(Scene scene) | 109 | public void AddRegion(Scene scene) |
110 | { | 110 | { |
111 | if (!m_enabled) | 111 | if (!m_enabled) |
112 | return; | 112 | return; |
113 | 113 | ||
114 | lock (m_Scenes) | 114 | lock (m_Scenes) |
115 | m_Scenes.Add(scene); | 115 | m_Scenes.Add(scene); |
@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
117 | 117 | ||
118 | public void RegionLoaded(Scene scene) | 118 | public void RegionLoaded(Scene scene) |
119 | { | 119 | { |
120 | if (!m_enabled) | 120 | if (!m_enabled) |
121 | return; | 121 | return; |
122 | 122 | ||
123 | IEstateModule em = scene.RequestModuleInterface<IEstateModule>(); | 123 | IEstateModule em = scene.RequestModuleInterface<IEstateModule>(); |
124 | 124 | ||
@@ -131,8 +131,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
131 | 131 | ||
132 | public void RemoveRegion(Scene scene) | 132 | public void RemoveRegion(Scene scene) |
133 | { | 133 | { |
134 | if (!m_enabled) | 134 | if (!m_enabled) |
135 | return; | 135 | return; |
136 | 136 | ||
137 | lock (m_Scenes) | 137 | lock (m_Scenes) |
138 | m_Scenes.Remove(scene); | 138 | m_Scenes.Remove(scene); |