1 files changed, 25 insertions, 14 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index bc5e8f2..8bb7152 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -71,8 +71,6 @@
 #include "llweb.h"
 #include "llwebbrowserctrl.h"
 
-#include "llfloaterhtml.h"
-
 #include "llfloaterhtmlhelp.h"
 #include "llfloatertos.h"
 
@@ -257,15 +255,25 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
         // childSetAction("quit_btn", onClickQuit, this);
 
-        std::string channel = gSavedSettings.getString("VersionChannelName");
-        std::string version = llformat("%d.%d.%d (%d)",
+        std::string imp_channel = gSavedSettings.getString("VersionChannelName");
+        std::string imp_version = llformat("%d.%d.%d %s",
+                IMP_VERSION_MAJOR,
+                IMP_VERSION_MINOR,
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
+
+        std::string ll_channel = LL_VIEWER_NAME;
+        std::string ll_version = llformat("%d.%d.%d (%d)",
                 LL_VERSION_MAJOR,
                 LL_VERSION_MINOR,
                 LL_VERSION_PATCH,
                 LL_VIEWER_BUILD );
+
         LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        channel_text->setTextArg("[CHANNEL]", channel); // though not displayed
-        channel_text->setTextArg("[VERSION]", version);
+        channel_text->setTextArg("[CHANNEL]", imp_channel);
+        channel_text->setTextArg("[VERSION]", imp_version);
+        channel_text->setTextArg("[ALT_CHANNEL]", ll_channel);
+        channel_text->setTextArg("[ALT_VERSION]", ll_version);
         channel_text->setClickedCallback(onClickVersion);
         channel_text->setCallbackUserData(this);
         
@@ -428,7 +436,7 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
 {
         if (( KEY_RETURN == key ) && (MASK_ALT == mask))
         {
-                gViewerWindow->toggleFullscreen(FALSE);
+                gViewerWindow->toggleFullscreenConfirm();
                 return TRUE;
         }
 
@@ -447,7 +455,7 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
         if ( KEY_F1 == key )
         {
                 llinfos << "Spawning HTML help window" << llendl;
-                gViewerHtmlHelp.show();
+                LLFloaterMediaBrowser::helpF1();
                 return TRUE;
         }
 
@@ -599,6 +607,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
         combo->setCurrentByIndex(0);
 }
 
+
+// static
+void LLPanelLogin::setServer(S32 domain_name)
+{
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        combo->setCurrentByIndex(domain_name);
+}
+
 // static
 void LLPanelLogin::getFields(std::string *firstname,
                              std::string *lastname,
@@ -677,12 +693,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
-#if LL_RELEASE_FOR_DOWNLOAD
-        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-        sInstance->childSetVisible("server_combo", show_server);
-#else
         sInstance->childSetVisible("server_combo", TRUE);
-#endif
 
 #endif
 }
@@ -761,7 +772,7 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);