diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/WearableCacheItem.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Framework/WearableCacheItem.cs')
-rw-r--r-- | OpenSim/Framework/WearableCacheItem.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs index 966a6bc..ccaf69e 100644 --- a/OpenSim/Framework/WearableCacheItem.cs +++ b/OpenSim/Framework/WearableCacheItem.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework | |||
47 | WearableCacheItem[] retitems = new WearableCacheItem[itemmax]; | 47 | WearableCacheItem[] retitems = new WearableCacheItem[itemmax]; |
48 | for (uint i=0;i<itemmax;i++) | 48 | for (uint i=0;i<itemmax;i++) |
49 | retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i}; | 49 | retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i}; |
50 | return retitems; | 50 | return retitems; |
51 | } | 51 | } |
52 | 52 | ||
53 | public static WearableCacheItem[] FromOSD(OSD pInput, IAssetCache dataCache) | 53 | public static WearableCacheItem[] FromOSD(OSD pInput, IAssetCache dataCache) |
@@ -64,7 +64,7 @@ namespace OpenSim.Framework | |||
64 | CacheId = item["cacheid"].AsUUID(), | 64 | CacheId = item["cacheid"].AsUUID(), |
65 | TextureID = item["textureid"].AsUUID() | 65 | TextureID = item["textureid"].AsUUID() |
66 | }); | 66 | }); |
67 | 67 | ||
68 | if (dataCache != null && item.ContainsKey("assetdata")) | 68 | if (dataCache != null && item.ContainsKey("assetdata")) |
69 | { | 69 | { |
70 | AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString()); | 70 | AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString()); |
@@ -181,7 +181,7 @@ namespace OpenSim.Framework | |||
181 | pcache[idx].TextureAsset = asset; | 181 | pcache[idx].TextureAsset = asset; |
182 | } | 182 | } |
183 | else | 183 | else |
184 | */ | 184 | */ |
185 | pcache[idx].TextureAsset = null; | 185 | pcache[idx].TextureAsset = null; |
186 | } | 186 | } |
187 | } | 187 | } |