summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-22 15:22:43 -0800
committercallum <none@none>2010-12-22 15:22:43 -0800
commitfa776d805437a89bcd322513ce43e702853f5f1b (patch)
treed20fbea8008160e03cc1cfc0970a8d314098d5e2 /indra/newview/llfloaterpreference.h
parent064bdb00908f7b36e5ce65db28c7bd0ee9c9c0eb (diff)
parentc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff)
Merge with tip of viewer-development
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r--indra/newview/llfloaterpreference.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index c0f4d2a8bd..165de9f42d 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -77,7 +77,7 @@ public:
// translate user's busy response message according to current locale if message is default, otherwise do nothing
static void initBusyResponse();
-
+
void processProperties( void* pData, EAvatarProcessorType type );
void processProfileProperties(const LLAvatarData* pAvatarData );
void storeAvatarProperties( const LLAvatarData* pAvatarData );
@@ -90,6 +90,7 @@ protected:
void onClickBrowserClearCache();
void onLanguageChange();
+ void onNameTagOpacityChange(const LLSD& newvalue);
// set value of "BusyResponseChanged" in account settings depending on whether busy response
// string differs from default after user changes.