#6151 set Remember username and password check boxes to checked after filling the fields

4 files changed, 36 insertions, 3 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 19310ea32f..323ccdce46 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3808,6 +3808,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>JoinFloaterOverlayOpacity</key>
+    <map>
+      <key>Comment</key>
+      <string>Opacity of the screen darkening overlay behind the Join floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.8</real>
+    </map>
+    <key>JoinFloaterTestSLapp</key>
+    <map>
+      <key>Comment</key>
+      <string>For testing only: Show links in the Join floater that trigger its close/join SLapps.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>JoinURL</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterjoin.cpp b/indra/newview/llfloaterjoin.cpp
index 3222643635..0c77c4cdfa 100644
--- a/indra/newview/llfloaterjoin.cpp
+++ b/indra/newview/llfloaterjoin.cpp
@@ -35,8 +35,6 @@
 #include "llui.h"
 #include "llviewercontrol.h"
 
-static const F32 OVERLAY_OPACITY = 0.8f;
-
 // support for secondlife:///app/floaterjoin/{ACTION}/... SLapps
 class LLFloaterJoinHandler : public LLCommandHandler
 {
@@ -79,12 +77,14 @@ bool LLFloaterJoin::postBuild()
 
 void LLFloaterJoin::draw()
 {
+    static LLCachedControl<F32> overlay_opacity(gSavedSettings, "JoinFloaterOverlayOpacity");
+
     // darken everything behind the floater
     LLVector2 window_size = LLUI::getInstance()->getWindowSize();
     LLRect screen_rect = calcScreenRect();
     gl_rect_2d(-screen_rect.mLeft, ll_round(window_size.mV[VY]) - screen_rect.mBottom,
                ll_round(window_size.mV[VX]) - screen_rect.mLeft, -screen_rect.mBottom,
-               LLColor4(0.f, 0.f, 0.f, OVERLAY_OPACITY));
+               LLColor4(0.f, 0.f, 0.f, llclamp((F32)overlay_opacity, 0.f, 1.f)));
 
     LLModalDialog::draw();
 }
@@ -105,4 +105,8 @@ void LLFloaterJoin::onOpen(const LLSD& key)
     }
 
     centerOnScreen();
+
+    static LLCachedControl<bool> show_test_slapp(gSavedSettings, "JoinFloaterTestSLapp");
+    getChild<LLUICtrl>("test_close_link")->setVisible(show_test_slapp);
+    getChild<LLUICtrl>("test_join_link")->setVisible(show_test_slapp);
 }
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index d382ef2df5..77b09a610c 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -547,6 +547,11 @@ void LLPanelLogin::setCredentialFields(const std::string& username, const std::s
     sInstance->mPasswordLength = static_cast<unsigned int>(password.length());
     sInstance->mPasswordModified = true;
     sInstance->updateLoginButtons();
+
+    sInstance->getChild<LLUICtrl>("remember_name")->setValue(true);
+    LLUICtrl* remember_password = sInstance->getChild<LLUICtrl>("remember_password");
+    remember_password->setValue(true);
+    remember_password->setEnabled(true);
 }
 
 //static
diff --git a/indra/newview/skins/default/xui/en/floater_join.xml b/indra/newview/skins/default/xui/en/floater_join.xml
index 45f48421f4..28c879f36e 100644
--- a/indra/newview/skins/default/xui/en/floater_join.xml
+++ b/indra/newview/skins/default/xui/en/floater_join.xml
@@ -37,6 +37,7 @@
   <text
    follows="right|bottom"
    name="test_close_link"
+   visible="false"
    parse_urls="true"
    font="SansSerifSmall"
    text_color="White"
@@ -50,6 +51,7 @@
   <text
    follows="left|bottom"
    name="test_join_link"
+   visible="false"
    parse_urls="true"
    font="SansSerifSmall"
    text_color="White"