From f429decb0c222b293cee4d3b27c8340262fab572 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Fri, 9 Nov 2012 17:00:43 -0800 Subject: CHUI-486: Now the new chat preferences in drop down lists and checkboxes are storable. These values are accessible globally using gSavedSettings. --- indra/llui/llcheckboxctrl.cpp | 14 +-- indra/llui/llcheckboxctrl.h | 2 - indra/newview/app_settings/settings.xml | 121 +++++++++++++++++++++ .../default/xui/en/panel_preferences_chat.xml | 46 ++++---- 4 files changed, 143 insertions(+), 40 deletions(-) (limited to 'indra') diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 4fe444c1a4..5525520d78 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -107,7 +107,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p) LLButton::Params params = p.check_button; params.rect(btn_rect); //params.control_name(p.control_name); - params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onButtonPress, this, _2)); + params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onCommit, this)); params.commit_on_return(false); // Checkboxes only allow boolean initial values, but buttons can // take any LLSD. @@ -123,18 +123,6 @@ LLCheckBoxCtrl::~LLCheckBoxCtrl() // Children all cleaned up by default view destructor. } - -// static -void LLCheckBoxCtrl::onButtonPress( const LLSD& data ) -{ - //if (mRadioStyle) - //{ - // setValue(TRUE); - //} - - onCommit(); -} - void LLCheckBoxCtrl::onCommit() { if( getEnabled() ) diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 67d8091a97..5ce45b2135 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -103,8 +103,6 @@ public: virtual void setControlName(const std::string& control_name, LLView* context); - void onButtonPress(const LLSD& data); - virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control. virtual void resetDirty(); // Clear dirty state diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5694cb9f30..bba1f4910a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4667,6 +4667,17 @@ Value 1 + KeepConversationLogTranscripts + + Comment + Keep a conversation log and transcripts + Persist + 1 + Type + Boolean + Value + 0 + LandBrushSize Comment @@ -6285,6 +6296,61 @@ Value 305 + NotificationConferenceIMOptions + + Comment + Specifies how the UI responds to Conference IM Notifications. + Persist + 1 + Type + String + Value + 0 + + NotificationFriendIMOptions + + Comment + Specifies how the UI responds to Friend IM Notifications. + Persist + 1 + Type + String + Value + 0 + + NotificationGroupChatOptions + + Comment + Specifies how the UI responds to Group Chat Notifications. + Persist + 1 + Type + String + Value + 0 + + NotificationNearbyChatOptions + + Comment + Specifies how the UI responds to Nearby Chat Notifications. + Persist + 1 + Type + String + Value + 0 + + NotificationNonFriendIMOptions + + Comment + Specifies how the UI responds to Non Friend IM Notifications. + Persist + 1 + Type + String + Value + 0 + NotificationToastLifeTime Comment @@ -6801,6 +6867,61 @@ Value 1 + PlaySoundGroupChatMessages + + Comment + Plays a sound when have a group chat message. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundIncomingVoiceCall + + Comment + Plays a sound when have an incoming voice call. + Persist + 1 + Type + Boolean + Value + 1 + + PlaySoundInventoryOffer + + Comment + Plays a sound when have an inventory offer. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundNewConversation + + Comment + Plays a sound when have a new conversation. + Persist + 1 + Type + Boolean + Value + 1 + + PlaySoundTeleportOffer + + Comment + Plays a sound when have a teleport offer. + Persist + 1 + Type + Boolean + Value + 1 + PluginAttachDebuggerToPlugins Comment diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 4964df53bb..f1b11e2ca8 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -37,6 +37,7 @@ top_pad="6" width="330" />