diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/WearableCacheItem.cs | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index dcd5cc7..ebb00d2 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -374,8 +374,7 @@ namespace OpenSim.Framework | |||
374 | OSDMap urls = (OSDMap)tmpOSD; | 374 | OSDMap urls = (OSDMap)tmpOSD; |
375 | foreach (KeyValuePair<String, OSD> kvp in urls) | 375 | foreach (KeyValuePair<String, OSD> kvp in urls) |
376 | { | 376 | { |
377 | tmpOSD = kvp.Value; | 377 | ServiceURLs[kvp.Key] = kvp.Value; |
378 | ServiceURLs[kvp.Key] = tmpOSD.AsString(); | ||
379 | //System.Console.WriteLine("XXX " + kvp.Key + "=" + ServiceURLs[kvp.Key]); | 378 | //System.Console.WriteLine("XXX " + kvp.Key + "=" + ServiceURLs[kvp.Key]); |
380 | } | 379 | } |
381 | } | 380 | } |
@@ -394,6 +393,5 @@ namespace OpenSim.Framework | |||
394 | } | 393 | } |
395 | } | 394 | } |
396 | } | 395 | } |
397 | |||
398 | } | 396 | } |
399 | } | 397 | } |
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs index 84b9ee9..e060f22 100644 --- a/OpenSim/Framework/WearableCacheItem.cs +++ b/OpenSim/Framework/WearableCacheItem.cs | |||
@@ -161,20 +161,16 @@ namespace OpenSim.Framework | |||
161 | public static WearableCacheItem[] BakedFromOSD(OSD pInput) | 161 | public static WearableCacheItem[] BakedFromOSD(OSD pInput) |
162 | { | 162 | { |
163 | WearableCacheItem[] pcache = WearableCacheItem.GetDefaultCacheItem(); | 163 | WearableCacheItem[] pcache = WearableCacheItem.GetDefaultCacheItem(); |
164 | OSD tmpOSD; | ||
165 | if (pInput.Type == OSDType.Array) | 164 | if (pInput.Type == OSDType.Array) |
166 | { | 165 | { |
167 | OSDArray itemarray = (OSDArray)pInput; | 166 | OSDArray itemarray = (OSDArray)pInput; |
168 | foreach (OSDMap item in itemarray) | 167 | foreach (OSDMap item in itemarray) |
169 | { | 168 | { |
170 | tmpOSD = item["textureindex"]; | 169 | int idx = item["textureindex"].AsInteger(); |
171 | int idx = tmpOSD.AsInteger(); | ||
172 | if (idx < 0 || idx > pcache.Length) | 170 | if (idx < 0 || idx > pcache.Length) |
173 | continue; | 171 | continue; |
174 | tmpOSD = item["cacheid"]; | 172 | pcache[idx].CacheId = item["cacheid"].AsUUID(); |
175 | pcache[idx].CacheId = tmpOSD.AsUUID(); | 173 | pcache[idx].TextureID = item["textureid"].AsUUID(); |
176 | tmpOSD = item["textureid"]; | ||
177 | pcache[idx].TextureID = tmpOSD.AsUUID(); | ||
178 | /* | 174 | /* |
179 | if (item.ContainsKey("assetdata")) | 175 | if (item.ContainsKey("assetdata")) |
180 | { | 176 | { |
@@ -220,6 +216,4 @@ namespace OpenSim.Framework | |||
220 | return null; | 216 | return null; |
221 | } | 217 | } |
222 | } | 218 | } |
223 | |||
224 | |||
225 | } | 219 | } |