diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 060fe28..7adac58 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
50 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); | 50 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); |
51 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); | 51 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); |
52 | private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); | 52 | private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); |
53 | private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); | ||
53 | 54 | ||
54 | public BaseHttpServer httpListener; | 55 | public BaseHttpServer httpListener; |
55 | public NetworkServersInfo serversInfo; | 56 | public NetworkServersInfo serversInfo; |
@@ -134,7 +135,15 @@ namespace OpenSim.Region.Communications.OGS1 | |||
134 | else | 135 | else |
135 | { | 136 | { |
136 | m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY); | 137 | m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY); |
137 | 138 | if (GridRespData.ContainsKey("allow_forceful_banlines")) | |
139 | { | ||
140 | |||
141 | if ((string)GridRespData["allow_forceful_banlines"] != "TRUE") | ||
142 | { | ||
143 | //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle); | ||
144 | m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); | ||
145 | } | ||
146 | } | ||
138 | 147 | ||
139 | } | 148 | } |
140 | return m_localBackend.RegisterRegion(regionInfo); | 149 | return m_localBackend.RegisterRegion(regionInfo); |
@@ -144,7 +153,23 @@ namespace OpenSim.Region.Communications.OGS1 | |||
144 | { | 153 | { |
145 | return false; | 154 | return false; |
146 | } | 155 | } |
156 | public virtual Dictionary<string, string> GetGridSettings() | ||
157 | { | ||
158 | Dictionary<string, string> returnGridSettings = new Dictionary<string, string>(); | ||
159 | lock (m_queuedGridSettings) | ||
160 | { | ||
161 | foreach (string Dictkey in m_queuedGridSettings.Keys) | ||
162 | { | ||
163 | returnGridSettings.Add(Dictkey, m_queuedGridSettings[Dictkey]); | ||
164 | |||
165 | } | ||
147 | 166 | ||
167 | |||
168 | m_queuedGridSettings.Clear(); | ||
169 | } | ||
170 | |||
171 | return returnGridSettings; | ||
172 | } | ||
148 | /// <summary> | 173 | /// <summary> |
149 | /// | 174 | /// |
150 | /// </summary> | 175 | /// </summary> |