diff options
author | Diva Canto | 2010-05-09 13:39:56 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-09 13:39:56 -0700 |
commit | b233a4b2cab3a39f9edc17130cd7c2f2f807d6bb (patch) | |
tree | 0f895f8334a1f98f3ed9f273906f989314400ce5 /OpenSim/Region/Framework | |
parent | Add Delete handler to SQLite (NG) (diff) | |
download | opensim-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 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs index de1bcd4..ac6afed 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |||
@@ -29,6 +29,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
29 | { | 29 | { |
30 | public interface IWorldMapModule | 30 | public interface IWorldMapModule |
31 | { | 31 | { |
32 | void LazySaveGeneratedMaptile(byte[] data, bool temporary); | 32 | void RegenerateMaptile(byte[] data); |
33 | } | 33 | } |
34 | } | 34 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c0fa7b4..edbef4c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1823,7 +1823,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1823 | /// <summary> | 1823 | /// <summary> |
1824 | /// Create a terrain texture for this scene | 1824 | /// Create a terrain texture for this scene |
1825 | /// </summary> | 1825 | /// </summary> |
1826 | public void CreateTerrainTexture(bool temporary) | 1826 | public void CreateTerrainTexture() |
1827 | { | 1827 | { |
1828 | //create a texture asset of the terrain | 1828 | //create a texture asset of the terrain |
1829 | IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>(); | 1829 | IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>(); |
@@ -1841,7 +1841,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1841 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); | 1841 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); |
1842 | 1842 | ||
1843 | if (mapModule != null) | 1843 | if (mapModule != null) |
1844 | mapModule.LazySaveGeneratedMaptile(data, temporary); | 1844 | mapModule.RegenerateMaptile(data); |
1845 | else | ||
1846 | m_log.DebugFormat("[SCENE]: MapModule is null, can't save maptile"); | ||
1845 | } | 1847 | } |
1846 | } | 1848 | } |
1847 | 1849 | ||