diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-18 03:02:44 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-18 03:02:44 +0300 |
| commit | 64b3473f4920b0340e731e44342e2599ad46d698 (patch) | |
| tree | e8f9994d427d5dcce6e3a19432f31f5f86f16f46 /indra/newview/lllocalbitmaps.h | |
| parent | 151df9b87b409283d11de7d3b918fd23f9772354 (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
| -rw-r--r-- | indra/newview/lllocalbitmaps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 59467922b4..ee4161fb45 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -64,7 +64,7 @@ class LLLocalBitmap void replaceIDs(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 updateUserVolumes(LLUUID old_id, LLUUID new_id, U32 channel); void updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type); LLAvatarAppearanceDefines::ETextureIndex getTexIndex(LLWearableType::EType type, LLAvatarAppearanceDefines::EBakedTextureIndex baked_texind); |