diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
| commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
| tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/newview/lllocalbitmaps.h | |
| parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
| parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) | |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
| -rwxr-xr-x | indra/newview/lllocalbitmaps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 580b6dfa7e..2ee84bf46e 100755 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -62,8 +62,8 @@ class LLLocalBitmap private: /* self update private section */ bool decodeBitmap(LLPointer<LLImageRaw> raw); void replaceIDs(LLUUID old_id, LLUUID new_id); - std::vector<LLViewerObject*> prepUpdateObjects(LLUUID old_id); - void updateUserPrims(LLUUID old_id, LLUUID new_id); + std::vector<LLViewerObject*> prepUpdateObjects(LLUUID old_id, U32 channel); + void updateUserPrims(LLUUID old_id, LLUUID new_id, U32 channel); void updateUserSculpts(LLUUID old_id, LLUUID new_id); void updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type); LLAvatarAppearanceDefines::ETextureIndex getTexIndex(LLWearableType::EType type, LLAvatarAppearanceDefines::EBakedTextureIndex baked_texind); |