From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/lllocalbitmaps.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/lllocalbitmaps.h (limited to 'indra/newview/lllocalbitmaps.h') diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h old mode 100644 new mode 100755 -- cgit v1.2.3 From c3804fd041bc606cb20af615f6f030365202bedc Mon Sep 17 00:00:00 2001 From: Serpentu Date: Fri, 24 May 2013 11:47:06 -0400 Subject: MATBUG-8: fix local texture support for normal and specular maps --- indra/newview/lllocalbitmaps.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lllocalbitmaps.h') 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 raw); void replaceIDs(LLUUID old_id, LLUUID new_id); - std::vector prepUpdateObjects(LLUUID old_id); - void updateUserPrims(LLUUID old_id, LLUUID new_id); + std::vector 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); -- cgit v1.2.3