diff options
Diffstat (limited to 'OpenSim/Data/Null/NullRegionData.cs')
-rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index 397b32d..f276d10 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.Data.Null | |||
49 | if (Instance == null) | 49 | if (Instance == null) |
50 | Instance = this; | 50 | Instance = this; |
51 | //Console.WriteLine("[XXX] NullRegionData constructor"); | 51 | //Console.WriteLine("[XXX] NullRegionData constructor"); |
52 | } | 52 | } |
53 | 53 | ||
54 | public List<RegionData> Get(string regionName, UUID scopeID) | 54 | public List<RegionData> Get(string regionName, UUID scopeID) |
55 | { | 55 | { |
56 | if (Instance != this) | 56 | if (Instance != this) |
@@ -160,37 +160,37 @@ namespace OpenSim.Data.Null | |||
160 | m_regionData.Remove(regionID); | 160 | m_regionData.Remove(regionID); |
161 | 161 | ||
162 | return true; | 162 | return true; |
163 | } | 163 | } |
164 | 164 | ||
165 | public List<RegionData> GetDefaultRegions(UUID scopeID) | 165 | public List<RegionData> GetDefaultRegions(UUID scopeID) |
166 | { | 166 | { |
167 | return Get((int)RegionFlags.DefaultRegion, scopeID); | 167 | return Get((int)RegionFlags.DefaultRegion, scopeID); |
168 | } | 168 | } |
169 | 169 | ||
170 | public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) | 170 | public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) |
171 | { | 171 | { |
172 | return Get((int)RegionFlags.FallbackRegion, scopeID); | 172 | return Get((int)RegionFlags.FallbackRegion, scopeID); |
173 | } | 173 | } |
174 | 174 | ||
175 | public List<RegionData> GetHyperlinks(UUID scopeID) | 175 | public List<RegionData> GetHyperlinks(UUID scopeID) |
176 | { | 176 | { |
177 | return Get((int)RegionFlags.Hyperlink, scopeID); | 177 | return Get((int)RegionFlags.Hyperlink, scopeID); |
178 | } | 178 | } |
179 | 179 | ||
180 | private List<RegionData> Get(int regionFlags, UUID scopeID) | 180 | private List<RegionData> Get(int regionFlags, UUID scopeID) |
181 | { | 181 | { |
182 | if (Instance != this) | 182 | if (Instance != this) |
183 | return Instance.Get(regionFlags, scopeID); | 183 | return Instance.Get(regionFlags, scopeID); |
184 | 184 | ||
185 | List<RegionData> ret = new List<RegionData>(); | 185 | List<RegionData> ret = new List<RegionData>(); |
186 | 186 | ||
187 | foreach (RegionData r in m_regionData.Values) | 187 | foreach (RegionData r in m_regionData.Values) |
188 | { | 188 | { |
189 | if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0) | 189 | if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0) |
190 | ret.Add(r); | 190 | ret.Add(r); |
191 | } | 191 | } |
192 | 192 | ||
193 | return ret; | 193 | return ret; |
194 | } | 194 | } |
195 | } | 195 | } |
196 | } \ No newline at end of file | 196 | } \ No newline at end of file |