From 85e698fa72399ecb1ab9dab5e5a88e7389fdd234 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
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(-)
(limited to 'indra')
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<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+
getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled);
getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled);
}
@@ -1297,7 +1297,11 @@ BOOL LLPanelPreference::postBuild()
{
getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic"));
}
-
+ if (hasChild("voice_call_friends_only_check"))
+ {
+ getChild<LLCheckBoxCtrl>("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.
<usetemplate
name="okbutton"
- yestext="Yes"/>
+ yestext="OK"/>
</notification>
<notification
--
cgit v1.2.3