diff options
| author | Melanie Thielker | 2014-08-07 16:55:00 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-07 16:55:00 +0200 |
| commit | a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f (patch) | |
| tree | 39219012afb0e847debf29fe0c9170b445bc4056 /OpenSim/Framework/WearableCacheItem.cs | |
| parent | Merge branch 'ubitworkmaster' (diff) | |
| parent | minor clean, dont check for cache if we aren't using it.. (diff) | |
| download | opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.zip opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.gz opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.bz2 opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Framework/WearableCacheItem.cs')
| -rw-r--r-- | OpenSim/Framework/WearableCacheItem.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs index 1aecf79..cde2862 100644 --- a/OpenSim/Framework/WearableCacheItem.cs +++ b/OpenSim/Framework/WearableCacheItem.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Framework | |||
| 46 | int itemmax = 21; | 46 | int itemmax = 21; |
| 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 + 1}; | 49 | retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i}; |
| 50 | return retitems; | 50 | return retitems; |
| 51 | } | 51 | } |
| 52 | public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache) | 52 | public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache) |