From e76f673cc2d548ffb20f2c617ac6f6ee24a32bd5 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Thu, 4 Mar 2010 13:39:54 +0200 Subject: Related to major EXT-4105 ([BSI] group names are not able to be copied from side panel) - added ability to copy group names from group info panel title. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 5147bb72d0..701a14e1c5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -44,11 +44,16 @@ background_visible="true" tab_stop="false" top="2" width="23" /> - Date: Thu, 4 Mar 2010 13:41:04 +0200 Subject: Fixed normal EXT-4798 (Voice notifications steal keyboard focus by default) --HG-- branch : product-engine --- indra/newview/llimview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1dc601e260..b3f085ef6d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1565,7 +1565,7 @@ void LLCallDialog::onOpen(const LLSD& key) LLDockableFloater::onOpen(key); // it should be over the all floaters. EXT-5116 - gFloaterView->bringToFront(this); + gFloaterView->bringToFront(this, FALSE); } void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) -- cgit v1.2.3 From 85e698fa72399ecb1ab9dab5e5a88e7389fdd234 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Thu, 4 Mar 2010 15:24:22 +0200 Subject: fixed reopened EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS auto-response --HG-- branch : product-engine --- indra/newview/llfloaterpreference.cpp | 8 ++++++-- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 224514dd48..839d3f0c21 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1289,7 +1289,7 @@ BOOL LLPanelPreference::postBuild() if (hasChild("media_enabled")) { bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia"); - getChild("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + getChild("media_enabled")->set(media_enabled); getChild("autoplay_enabled")->setEnabled(media_enabled); } @@ -1297,7 +1297,11 @@ BOOL LLPanelPreference::postBuild() { getChild("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic")); } - + if (hasChild("voice_call_friends_only_check")) + { + getChild("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + } + apply(); return true; } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 936f4a3fab..14347e146b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -249,7 +249,7 @@ Save all changes to clothing/body parts? Non-friends won't know that you've choosen to ignore their calls and instant messages. + yestext="OK"/> Date: Thu, 4 Mar 2010 15:40:35 +0200 Subject: partial fix for EXT-4819 [NUX] New Application Icon Integration only the obvious icon files are replaced --HG-- branch : product-engine --- indra/newview/installers/windows/install_icon.ico | Bin 25214 -> 367958 bytes .../newview/installers/windows/uninstall_icon.ico | Bin 25214 -> 367958 bytes indra/newview/res/ll_icon.ico | Bin 364590 -> 367958 bytes indra/newview/secondlife.icns | Bin 135209 -> 180809 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico index 1e00530c90..efe6c4f323 100644 Binary files a/indra/newview/installers/windows/install_icon.ico and b/indra/newview/installers/windows/install_icon.ico differ diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico index c4ec6c70bd..05e1546860 100644 Binary files a/indra/newview/installers/windows/uninstall_icon.ico and b/indra/newview/installers/windows/uninstall_icon.ico differ diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico index c35a3fa3a3..87985b9285 100644 Binary files a/indra/newview/res/ll_icon.ico and b/indra/newview/res/ll_icon.ico differ diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns index ceb6036e0e..4560d4bb24 100644 Binary files a/indra/newview/secondlife.icns and b/indra/newview/secondlife.icns differ -- cgit v1.2.3