aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WearableCacheItem.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-10-26 18:13:44 +0000
committerUbitUmarov2014-10-26 18:13:44 +0000
commit736490dcb60047e6060c13c990f13dc0c1bf0ea6 (patch)
tree12f569d659f82b8f2265ae4378c1225e5628b2c3 /OpenSim/Framework/WearableCacheItem.cs
parentremove debug message (diff)
downloadopensim-SC-736490dcb60047e6060c13c990f13dc0c1bf0ea6.zip
opensim-SC-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.gz
opensim-SC-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.bz2
opensim-SC-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.xz
dont send baked textures assets, but send cache information
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/WearableCacheItem.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index f49697d..af28abc 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -144,12 +144,14 @@ namespace OpenSim.Framework
144 itemmap.Add("textureindex", OSD.FromUInteger(item.TextureIndex)); 144 itemmap.Add("textureindex", OSD.FromUInteger(item.TextureIndex));
145 itemmap.Add("cacheid", OSD.FromUUID(item.CacheId)); 145 itemmap.Add("cacheid", OSD.FromUUID(item.CacheId));
146 itemmap.Add("textureid", OSD.FromUUID(item.TextureID)); 146 itemmap.Add("textureid", OSD.FromUUID(item.TextureID));
147/*
147 if (item.TextureAsset != null) 148 if (item.TextureAsset != null)
148 { 149 {
149 itemmap.Add("assetdata", OSD.FromBinary(item.TextureAsset.Data)); 150 itemmap.Add("assetdata", OSD.FromBinary(item.TextureAsset.Data));
150 itemmap.Add("assetcreator", OSD.FromString(item.TextureAsset.CreatorID)); 151 itemmap.Add("assetcreator", OSD.FromString(item.TextureAsset.CreatorID));
151 itemmap.Add("assetname", OSD.FromString(item.TextureAsset.Name)); 152 itemmap.Add("assetname", OSD.FromString(item.TextureAsset.Name));
152 } 153 }
154 */
153 arr.Add(itemmap); 155 arr.Add(itemmap);
154 } 156 }
155 return arr; 157 return arr;
@@ -169,6 +171,7 @@ namespace OpenSim.Framework
169 continue; 171 continue;
170 pcache[idx].CacheId = item["cacheid"].AsUUID(); 172 pcache[idx].CacheId = item["cacheid"].AsUUID();
171 pcache[idx].TextureID = item["textureid"].AsUUID(); 173 pcache[idx].TextureID = item["textureid"].AsUUID();
174/*
172 if (item.ContainsKey("assetdata")) 175 if (item.ContainsKey("assetdata"))
173 { 176 {
174 AssetBase asset = new AssetBase(item["textureid"].AsUUID(), "BakedTexture", (sbyte)AssetType.Texture, UUID.Zero.ToString()); 177 AssetBase asset = new AssetBase(item["textureid"].AsUUID(), "BakedTexture", (sbyte)AssetType.Texture, UUID.Zero.ToString());
@@ -178,6 +181,7 @@ namespace OpenSim.Framework
178 pcache[idx].TextureAsset = asset; 181 pcache[idx].TextureAsset = asset;
179 } 182 }
180 else 183 else
184 */
181 pcache[idx].TextureAsset = null; 185 pcache[idx].TextureAsset = null;
182 } 186 }
183 } 187 }