From 01b28ddf5ddc7118bc8b2047d899aee0293a8721 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 6 Oct 2010 20:10:36 -0700 Subject: EXP-156 WIP Implement custom Skylight hints --- indra/newview/llfirstuse.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 275f134400..3886df4ee9 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -89,6 +89,7 @@ public: static void notUsingDestinationGuide(bool enable = true); static void notUsingSidePanel(bool enable = true); static void notMoving(bool enable = true); + static void viewPopup(bool enable = true); static void newInventory(bool enable = true); static void receiveLindens(bool enable = true); static void useSandbox(); -- cgit v1.2.3 From e638204dc2d8b409f17f7cdf8938deb97d137dbc Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 21 Oct 2010 17:14:14 -0700 Subject: EXP-273 WIP added avatar picker popup and hint --- indra/newview/llfirstuse.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 3886df4ee9..04783544b9 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -87,6 +87,7 @@ public: static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); static void notUsingDestinationGuide(bool enable = true); + static void notUsingAvatarPicker(bool enable = true); static void notUsingSidePanel(bool enable = true); static void notMoving(bool enable = true); static void viewPopup(bool enable = true); -- cgit v1.2.3 From c111288a23825de8e00d252f98652c362a054251 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 28 Jan 2011 17:19:42 -0700 Subject: fixed the major memory leaking for SH-723/SH-847: memoy leaking --- indra/newview/llfirstuse.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 81659988e6..489f58626a 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -78,11 +78,11 @@ class LLFirstUse public: // Add a config variable to be reset on resetFirstUse() - static void addConfigVariable(const std::string& var); + //static void addConfigVariable(const std::string& var); // Sets all controls back to show the dialogs. - static void disableFirstUse(); - static void resetFirstUse(); + //static void disableFirstUse(); + //static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); @@ -98,7 +98,8 @@ public: protected: static void firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args = LLSD(), LLSD payload = LLSD()); - static std::set sConfigVariables; + //static std::set sConfigVariables; + static std::set sConfigVariablesEnabled; static void init(); static bool processNotification(const LLSD& notify); -- cgit v1.2.3 From c62055043380147a760dc7f37ac0900df1a7f789 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 31 Jan 2011 19:18:58 -0500 Subject: VWR-22024 -- apply Bao's patch to beta --- indra/newview/llfirstuse.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 81659988e6..489f58626a 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -78,11 +78,11 @@ class LLFirstUse public: // Add a config variable to be reset on resetFirstUse() - static void addConfigVariable(const std::string& var); + //static void addConfigVariable(const std::string& var); // Sets all controls back to show the dialogs. - static void disableFirstUse(); - static void resetFirstUse(); + //static void disableFirstUse(); + //static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); @@ -98,7 +98,8 @@ public: protected: static void firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args = LLSD(), LLSD payload = LLSD()); - static std::set sConfigVariables; + //static std::set sConfigVariables; + static std::set sConfigVariablesEnabled; static void init(); static bool processNotification(const LLSD& notify); -- cgit v1.2.3 From 903b3ab35d67eec1b780b0e9f7407f7c47544ea9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 17:38:35 -0800 Subject: SOCIAL-601 FIX avatar picker hint --- indra/newview/llfirstuse.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..17250586c0 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -87,7 +87,6 @@ public: static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); static void notUsingDestinationGuide(bool enable = true); - static void notUsingAvatarPicker(bool enable = true); static void notUsingSidePanel(bool enable = true); static void notMoving(bool enable = true); static void viewPopup(bool enable = true); -- cgit v1.2.3 From afe9557ea922a382497f99f6341a13ce9d9b9228 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 15:56:47 -0800 Subject: Backed out changeset: 4de3178c6c81 --- indra/newview/llfirstuse.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..81659988e6 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -78,11 +78,11 @@ class LLFirstUse public: // Add a config variable to be reset on resetFirstUse() - //static void addConfigVariable(const std::string& var); + static void addConfigVariable(const std::string& var); // Sets all controls back to show the dialogs. - //static void disableFirstUse(); - //static void resetFirstUse(); + static void disableFirstUse(); + static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); @@ -98,8 +98,7 @@ public: protected: static void firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args = LLSD(), LLSD payload = LLSD()); - //static std::set sConfigVariables; - static std::set sConfigVariablesEnabled; + static std::set sConfigVariables; static void init(); static bool processNotification(const LLSD& notify); -- cgit v1.2.3 From d9015a836f59c228818dc85e37ef4807b2d1b181 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 16 Mar 2011 18:32:28 -0400 Subject: STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button" --- indra/newview/llfirstuse.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llfirstuse.h') diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..dff5483354 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -68,6 +68,8 @@ object or from inventory. 13. First time you open the debug menus (ctrl-alt-shift D) 14. First time you create/edit a sculpted prim. + +15. Explanation of Speak&flyout buttons. */ class LLNotification; @@ -85,6 +87,7 @@ public: //static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); + static void speak(bool enable = true); static void sit(bool enable = true); static void notUsingDestinationGuide(bool enable = true); static void notUsingAvatarPicker(bool enable = true); -- cgit v1.2.3