aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-12 17:20:07 +0100
committerUbitUmarov2015-09-12 17:20:07 +0100
commit064aade4c15d2cbc14fc9968ea4434d25b480be6 (patch)
tree143cafcbdfb01d6177eba3a7db1868f27b5eec68
parent let regionCache really find a varregion by a position (diff)
downloadopensim-SC_OLD-064aade4c15d2cbc14fc9968ea4434d25b480be6.zip
opensim-SC_OLD-064aade4c15d2cbc14fc9968ea4434d25b480be6.tar.gz
opensim-SC_OLD-064aade4c15d2cbc14fc9968ea4434d25b480be6.tar.bz2
opensim-SC_OLD-064aade4c15d2cbc14fc9968ea4434d25b480be6.tar.xz
remove a silly and not necessary List i added
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 3e69394..595db2f 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Null
134 if (m_useStaticInstance && Instance != this) 134 if (m_useStaticInstance && Instance != this)
135 return Instance.Get(posX, posY, scopeID); 135 return Instance.Get(posX, posY, scopeID);
136 136
137 List<RegionData> ret = new List<RegionData>(); 137 RegionData ret = null;
138 138
139 lock (m_regionData) 139 lock (m_regionData)
140 { 140 {
@@ -142,14 +142,14 @@ namespace OpenSim.Data.Null
142 { 142 {
143 if (posX >= r.posX && posX < r.posX + r.sizeX 143 if (posX >= r.posX && posX < r.posX + r.sizeX
144 && posY >= r.posY && posY < r.posY + r.sizeY) 144 && posY >= r.posY && posY < r.posY + r.sizeY)
145 ret.Add(r); 145 {
146 ret = r;
147 break;
148 }
146 } 149 }
147 } 150 }
148 151
149 if (ret.Count > 0) 152 return ret;
150 return ret[0];
151
152 return null;
153 } 153 }
154 154
155 public RegionData Get(UUID regionID, UUID scopeID) 155 public RegionData Get(UUID regionID, UUID scopeID)