diff options
| -rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 14 | ||||
| -rw-r--r-- | indra/llui/llcheckboxctrl.h | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 121 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 46 |
4 files changed, 143 insertions, 40 deletions
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 581656f4d3..9b8c86ffc8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4678,6 +4678,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>KeepConversationLogTranscripts</key> + <map> + <key>Comment</key> + <string>Keep a conversation log and transcripts</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>LandBrushSize</key> <map> <key>Comment</key> @@ -6296,6 +6307,61 @@ <key>Value</key> <integer>305</integer> </map> + <key>NotificationConferenceIMOptions</key> + <map> + <key>Comment</key> + <string>Specifies how the UI responds to Conference IM Notifications.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>0</string> + </map> + <key>NotificationFriendIMOptions</key> + <map> + <key>Comment</key> + <string>Specifies how the UI responds to Friend IM Notifications.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>0</string> + </map> + <key>NotificationGroupChatOptions</key> + <map> + <key>Comment</key> + <string>Specifies how the UI responds to Group Chat Notifications.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>0</string> + </map> + <key>NotificationNearbyChatOptions</key> + <map> + <key>Comment</key> + <string>Specifies how the UI responds to Nearby Chat Notifications.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>0</string> + </map> + <key>NotificationNonFriendIMOptions</key> + <map> + <key>Comment</key> + <string>Specifies how the UI responds to Non Friend IM Notifications.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>0</string> + </map> <key>NotificationToastLifeTime</key> <map> <key>Comment</key> @@ -6812,6 +6878,61 @@ <key>Value</key> <integer>1</integer> </map> + <key>PlaySoundGroupChatMessages</key> + <map> + <key>Comment</key> + <string>Plays a sound when have a group chat message.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>PlaySoundIncomingVoiceCall</key> + <map> + <key>Comment</key> + <string>Plays a sound when have an incoming voice call.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>PlaySoundInventoryOffer</key> + <map> + <key>Comment</key> + <string>Plays a sound when have an inventory offer.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>PlaySoundNewConversation</key> + <map> + <key>Comment</key> + <string>Plays a sound when have a new conversation.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>PlaySoundTeleportOffer</key> + <map> + <key>Comment</key> + <string>Plays a sound when have a teleport offer.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>PluginAttachDebuggerToPlugins</key> <map> <key>Comment</key> 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" /> <check_box + control_name="KeepConversationLogTranscripts" height="16" label="Keep a conversation log and transcripts" layout="topleft" @@ -135,15 +136,15 @@ width="223"> <combo_box.item label="Pop up the message" - name="0" + name="PopUpMessage" value="0"/> <combo_box.item label="Flash toolbar button" - name="1" + name="FlashToolbarButton" value="1"/> <combo_box.item label="None" - name="2" + name="None" value="2"/> </combo_box> <text @@ -166,15 +167,15 @@ width="223"> <combo_box.item label="Pop up the message" - name="0" + name="PopUpMessage" value="0"/> <combo_box.item label="Flash toolbar button" - name="1" + name="FlashToolbarButton" value="1"/> <combo_box.item label="None" - name="2" + name="None" value="2"/> </combo_box> <text @@ -197,15 +198,15 @@ width="223"> <combo_box.item label="Pop up the message" - name="0" + name="PopUpMessage" value="0"/> <combo_box.item label="Flash toolbar button" - name="1" + name="FlashToolbarButton" value="1"/> <combo_box.item label="None" - name="2" + name="None" value="2"/> </combo_box> <text @@ -228,15 +229,15 @@ width="223"> <combo_box.item label="Pop up the message" - name="0" + name="PopUpMessage" value="0"/> <combo_box.item label="Flash toolbar button" - name="1" + name="FlashToolbarButton" value="1"/> <combo_box.item label="None" - name="2" + name="None" value="2"/> </combo_box> <text @@ -259,15 +260,15 @@ width="223"> <combo_box.item label="Pop up the message" - name="0" + name="PopUpMessage" value="0"/> <combo_box.item label="Flash toolbar button" - name="1" + name="FlashToolBarButton" value="1"/> <combo_box.item label="None" - name="2" + name="None" value="2"/> </combo_box> <text @@ -304,9 +305,8 @@ Play sound: </text> <check_box - control_name="NewConversation" + control_name="PlaySoundNewConversation" height="16" - initial_value="true" label="New conversation" layout="topleft" left_pad="15" @@ -314,27 +314,24 @@ name="new_conversation" width="150" /> <check_box - control_name="IncomingVoiceCall" + control_name="PlaySoundIncomingVoiceCall" height="16" - initial_value="true" label="Incoming voice call" layout="topleft" top_pad="6" name="incoming_voice_call" width="150" /> <check_box - control_name="GroupChatMessages" + control_name="PlaySoundGroupChatMessages" height="16" - initial_value="false" label="Group chat messages" layout="topleft" top_pad="6" name="group_chat_messages" width="150" /> <check_box - control_name="TeleportOffer" + control_name="PlaySoundTeleportOffer" height="16" - initial_value="true" label="Teleport offer" layout="topleft" left_pad="35" @@ -342,9 +339,8 @@ name="teleport_offer" width="150" /> <check_box - control_name="InventoryOffer" + control_name="PlaySoundInventoryOffer" height="16" - initial_value="false" label="Inventory offer" layout="topleft" top_pad="6" |