aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-05-09 13:39:56 -0700
committerDiva Canto2010-05-09 13:39:56 -0700
commitb233a4b2cab3a39f9edc17130cd7c2f2f807d6bb (patch)
tree0f895f8334a1f98f3ed9f273906f989314400ce5 /OpenSim/Services
parentAdd Delete handler to SQLite (NG) (diff)
downloadopensim-SC-b233a4b2cab3a39f9edc17130cd7c2f2f807d6bb.zip
opensim-SC-b233a4b2cab3a39f9edc17130cd7c2f2f807d6bb.tar.gz
opensim-SC-b233a4b2cab3a39f9edc17130cd7c2f2f807d6bb.tar.bz2
opensim-SC-b233a4b2cab3a39f9edc17130cd7c2f2f807d6bb.tar.xz
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
* Fixed small bug with map search where the local sim regions weren't found.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 4fc38f3..470a4dd 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.AssetService
156 156
157 public bool Delete(string id) 157 public bool Delete(string id)
158 { 158 {
159 m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
159 UUID assetID; 160 UUID assetID;
160 if (!UUID.TryParse(id, out assetID)) 161 if (!UUID.TryParse(id, out assetID))
161 return false; 162 return false;
@@ -165,7 +166,11 @@ namespace OpenSim.Services.AssetService
165 return false; 166 return false;
166 167
167 if ((int)(asset.Flags & AssetFlags.Maptile) != 0) 168 if ((int)(asset.Flags & AssetFlags.Maptile) != 0)
169 {
168 return m_Database.Delete(id); 170 return m_Database.Delete(id);
171 }
172 else
173 m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
169 174
170 return false; 175 return false;
171 } 176 }
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 4089fce..7c98642 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -324,6 +324,7 @@ namespace OpenSim.Services.GridService
324 324
325 if (rdatas != null) 325 if (rdatas != null)
326 { 326 {
327 m_log.DebugFormat("[GRID SERVICE]: Found {0} regions", rdatas.Count);
327 foreach (RegionData rdata in rdatas) 328 foreach (RegionData rdata in rdatas)
328 { 329 {
329 if (count++ < maxNumber) 330 if (count++ < maxNumber)
@@ -331,7 +332,7 @@ namespace OpenSim.Services.GridService
331 } 332 }
332 } 333 }
333 334
334 if (m_AllowHypergridMapSearch && (rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains("."))) 335 if (m_AllowHypergridMapSearch && (rdatas == null || (rdatas != null && rdatas.Count == 0)) && name.Contains("."))
335 { 336 {
336 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name); 337 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name);
337 if (r != null) 338 if (r != null)