summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-11-12 11:45:39 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-11-12 11:45:39 +0200
commitac0bbba7a554834f763a0ffcd03fd25897bc374e (patch)
tree43512faee247882a0944e5baaba738d5bb5ba800 /indra
parentf13cc44f8999a9897c77411d1296582b7bc1f08d (diff)
SL-9699 Updated tooltip and initial checkbox value
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterforgetuser.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/floater_forget_user.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 5659cb2f79..55e25ace9a 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -99,7 +99,9 @@ BOOL LLFloaterForgetUser::postBuild()
}
bool enable_button = scroll_list->getFirstSelectedIndex() != -1;
- getChild<LLView>("delete_data")->setEnabled(enable_button);
+ LLCheckBoxCtrl *chk_box = getChild<LLCheckBoxCtrl>("delete_data");
+ chk_box->setEnabled(enable_button);
+ chk_box->set(FALSE);
LLButton *button = getChild<LLButton>("forget");
button->setEnabled(enable_button);
button->setCommitCallback(boost::bind(&LLFloaterForgetUser::onForgetClicked, this));
diff --git a/indra/newview/skins/default/xui/en/floater_forget_user.xml b/indra/newview/skins/default/xui/en/floater_forget_user.xml
index 0673901a96..86228d49ee 100644
--- a/indra/newview/skins/default/xui/en/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/en/floater_forget_user.xml
@@ -35,6 +35,5 @@
name="delete_data"
top_pad="5"
width="260"
- initial_value="1"
tool_tip="Deletes local files: chat history, last session screenshot, browser cookies, teleport history, toolbar settings, e t c"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 873f03aae9..766406e1d8 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -137,7 +137,7 @@
label="Remember me"
check_button.bottom="3"
name="remember_name"
- tool_tip="Already recorded user can be forgotten from preferences."
+ tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
width="145" />
<check_box
control_name="RememberPassword"