aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null/NullRegionData.cs
diff options
context:
space:
mode:
authorUbitUmarov2019-11-14 06:34:44 +0000
committerUbitUmarov2019-11-14 06:34:44 +0000
commit31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e (patch)
tree1714d1b387d631925abc9bb417adc17565084dc9 /OpenSim/Data/Null/NullRegionData.cs
parentComplete PostGres from previous commit - (Not Tested) (diff)
downloadopensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.zip
opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.gz
opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.bz2
opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.xz
work on previus 2 patchs
Diffstat (limited to 'OpenSim/Data/Null/NullRegionData.cs')
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs32
1 files changed, 24 insertions, 8 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index a4385fe..fd60480 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -68,12 +68,34 @@ namespace OpenSim.Data.Null
68 68
69 private delegate bool Matcher(string value); 69 private delegate bool Matcher(string value);
70 70
71 public RegionData GetSpecific(string regionName, UUID scopeID)
72 {
73 if (m_useStaticInstance && Instance != this)
74 return Instance.GetSpecific(regionName, scopeID);
75
76 string cleanName = regionName.ToLower();
77 Matcher queryMatch;
78 queryMatch = delegate (string s) { return s.Equals(cleanName); };
79
80 lock (m_regionData)
81 {
82 foreach (RegionData r in m_regionData.Values)
83 {
84 // m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
85 if (queryMatch(r.RegionName.ToLower()))
86 return(r);
87 }
88 }
89
90 return null;
91 }
92
71 public List<RegionData> Get(string regionName, UUID scopeID) 93 public List<RegionData> Get(string regionName, UUID scopeID)
72 { 94 {
73 if (m_useStaticInstance && Instance != this) 95 if (m_useStaticInstance && Instance != this)
74 return Instance.Get(regionName, scopeID); 96 return Instance.Get(regionName, scopeID);
75 97
76// m_log.DebugFormat("[NULL REGION DATA]: Getting region {0}, scope {1}", regionName, scopeID); 98 // m_log.DebugFormat("[NULL REGION DATA]: Getting region {0}, scope {1}", regionName, scopeID);
77 99
78 string cleanName = regionName.ToLower(); 100 string cleanName = regionName.ToLower();
79 101
@@ -166,13 +188,7 @@ namespace OpenSim.Data.Null
166 return null; 188 return null;
167 } 189 }
168 190
169 //BA MOD... 191 public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
170 public RegionData GetSpecific(string regionName, UUID ScopeID)
171 {
172 return null;
173 }
174
175 public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
176 { 192 {
177 if (m_useStaticInstance && Instance != this) 193 if (m_useStaticInstance && Instance != this)
178 return Instance.Get(startX, startY, endX, endY, scopeID); 194 return Instance.Get(startX, startY, endX, endY, scopeID);