diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index b1663ee..2340998 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -161,6 +161,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
161 | try | 161 | try |
162 | { | 162 | { |
163 | WebClient c = new WebClient(); | 163 | WebClient c = new WebClient(); |
164 | //m_log.Debug("JPEG: " + imageURL); | ||
164 | string name = regionID.ToString(); | 165 | string name = regionID.ToString(); |
165 | filename = Path.Combine(storagePath, name + ".jpg"); | 166 | filename = Path.Combine(storagePath, name + ".jpg"); |
166 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename); | 167 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename); |
@@ -189,11 +190,10 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
189 | 190 | ||
190 | ass.Data = imageData; | 191 | ass.Data = imageData; |
191 | 192 | ||
192 | mapTile = ass.FullID; | ||
193 | |||
194 | // finally | ||
195 | m_AssetService.Store(ass); | 193 | m_AssetService.Store(ass); |
196 | 194 | ||
195 | // finally | ||
196 | mapTile = ass.FullID; | ||
197 | } | 197 | } |
198 | catch // LEGIT: Catching problems caused by OpenJPEG p/invoke | 198 | catch // LEGIT: Catching problems caused by OpenJPEG p/invoke |
199 | { | 199 | { |