diff options
author | Melanie | 2010-12-15 08:18:02 +0100 |
---|---|---|
committer | Melanie | 2010-12-15 08:18:02 +0100 |
commit | ee1e725e394fbc15a6539f309ecebf21b70f73b0 (patch) | |
tree | 050fe40406cf0a906d0bf98e97f4c99e23dbfb61 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |
parent | Fix casts in llSetPayPrice (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ee1e725e394fbc15a6539f309ecebf21b70f73b0.zip opensim-SC-ee1e725e394fbc15a6539f309ecebf21b70f73b0.tar.gz opensim-SC-ee1e725e394fbc15a6539f309ecebf21b70f73b0.tar.bz2 opensim-SC-ee1e725e394fbc15a6539f309ecebf21b70f73b0.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 1ac8478..a1d9167 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -147,7 +147,10 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
147 | public UUID GetMapImage(UUID regionID, string imageURL, string storagePath) | 147 | public UUID GetMapImage(UUID regionID, string imageURL, string storagePath) |
148 | { | 148 | { |
149 | if (m_AssetService == null) | 149 | if (m_AssetService == null) |
150 | { | ||
151 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: No AssetService defined. Map tile not retrieved."); | ||
150 | return m_HGMapImage; | 152 | return m_HGMapImage; |
153 | } | ||
151 | 154 | ||
152 | UUID mapTile = m_HGMapImage; | 155 | UUID mapTile = m_HGMapImage; |
153 | string filename = string.Empty; | 156 | string filename = string.Empty; |
@@ -167,8 +170,6 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
167 | // !!! for now | 170 | // !!! for now |
168 | //info.RegionSettings.TerrainImageID = ass.FullID; | 171 | //info.RegionSettings.TerrainImageID = ass.FullID; |
169 | 172 | ||
170 | ass.Temporary = true; | ||
171 | ass.Local = true; | ||
172 | ass.Data = imageData; | 173 | ass.Data = imageData; |
173 | 174 | ||
174 | m_AssetService.Store(ass); | 175 | m_AssetService.Store(ass); |