summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalbitmaps.h
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-22 21:28:07 +0100
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-22 21:28:07 +0100
commit689beff6698fcb8582c44f58bb9896606850b149 (patch)
tree7f567399e152057c1fe80a863ef660b5850bb324 /indra/newview/lllocalbitmaps.h
parent313dbc7fea54cc58ceb8bd3437b91674360a3384 (diff)
parent3888de9439c20eb1698e16fb878a47d78cfdf85e (diff)
Merge 5.1.5
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
-rw-r--r--indra/newview/lllocalbitmaps.h2
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);