4 files changed, 112 insertions, 21 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f57cc12..707abc7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -486,6 +486,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>NewsBarURL</key>
+  <map>
+    <key>Comment</key>
+    <string>URL to load in the news bar on the login screen</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://app.kokuaviewer.org/news/</string>
+  </map>
   <key>ObjectIMColor</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 23b7785..d09875b 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -305,17 +305,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // make links open in external browser
         web_browser->setOpenInExternalBrowser( true );
 
-        // force the size to be correct (XML doesn't seem to be sufficient to do this) (with some padding so the other login screen doesn't show through)
-        LLRect htmlRect = getRect();
-#if USE_VIEWER_AUTH
-        htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY(), getRect().getWidth() + 6, getRect().getHeight());
-#else
-        htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY() + 40, getRect().getWidth() + 6, getRect().getHeight() - 78 );
-#endif
-        web_browser->setRect( htmlRect );
-        web_browser->reshape( htmlRect.getWidth(), htmlRect.getHeight(), TRUE );
-        reshape( getRect().getWidth(), getRect().getHeight(), 1 );
-
         // kick off a request to grab the url manually
         gResponsePtr = LLIamHereLogin::build( this );
         std::string login_page = gSavedSettings.getString("LoginPage");
@@ -330,6 +319,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         refreshLocation( false );
 #endif
 
+        loadNewsBar();
+
         LLFirstUse::useLoginScreen();
 }
 
@@ -417,13 +408,20 @@ void LLPanelLogin::draw()
                 S32 width = getRect().getWidth();
                 S32 height = getRect().getHeight();
 
+                S32 news_bar_height = 0;
+                LLWebBrowserCtrl* news_bar = getChild<LLWebBrowserCtrl>("news_bar");
+                if (news_bar)
+                {
+                        news_bar_height = news_bar->getRect().getHeight();
+                }
+
                 if ( mHtmlAvailable )
                 {
 #if !USE_VIEWER_AUTH
                         // draw a background box in black
-                        gl_rect_2d( 0, height - 264, width, 264, LLColor4( 0.0f, 0.0f, 0.0f, 1.f ) );
+                        gl_rect_2d( 0, height - 264 + news_bar_height, width, 264, LLColor4( 0.0f, 0.0f, 0.0f, 1.f ) );
                         // draw the bottom part of the background image - just the blue background to the native client UI
-                        mLogoImage->draw(0, -264, width + 8, mLogoImage->getHeight());
+                        mLogoImage->draw(0, -264 + news_bar_height, width + 8, mLogoImage->getHeight());
 #endif
                 }
                 else
@@ -1146,3 +1144,75 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
         }
 }
 */
+
+
+bool LLPanelLogin::loadNewsBar()
+{
+        std::string news_url = gSavedSettings.getString("NewsBarURL");
+
+        if (news_url.empty())
+        {
+                return false;
+        }
+
+        LLWebBrowserCtrl* news_bar = getChild<LLWebBrowserCtrl>("news_bar");
+
+        if (!news_bar)
+        {
+                return false;
+        }
+
+        // *HACK: Not sure how else to make LLWebBrowserCtrl respect user's
+        // preference when opening links with target="_blank". -Jacek
+        if (gSavedSettings.getBOOL("UseExternalBrowser"))
+        {
+                news_bar->setOpenInExternalBrowser( true );
+                news_bar->setOpenInInternalBrowser( false );
+        }
+        else
+        {
+                news_bar->setOpenInExternalBrowser( false );
+                news_bar->setOpenInInternalBrowser( true );
+        }
+
+
+        std::ostringstream full_url;
+
+        full_url << news_url;
+
+        // Append a "?" if the URL doesn't already have query params.
+        if (LLURI(news_url).queryMap().size() == 0)
+        {
+                full_url << "?";
+        }
+
+        std::string channel = gSavedSettings.getString("VersionChannelName");
+        std::string skin = gSavedSettings.getString("SkinCurrent");
+
+        std::string version =
+                llformat("%d.%d.%d",
+                         ViewerVersion::getImpMajorVersion(),
+                         ViewerVersion::getImpMinorVersion(),
+                         ViewerVersion::getImpPatchVersion());
+        if (!ViewerVersion::getImpTestVersion().empty())
+        {
+                version += " " + ViewerVersion::getImpTestVersion();
+        }
+
+        char* curl_channel = curl_escape(channel.c_str(), 0);
+        char* curl_version = curl_escape(version.c_str(), 0);
+        char* curl_skin    = curl_escape(skin.c_str(), 0);
+
+        full_url << "&channel=" << curl_channel;
+        full_url << "&version=" << curl_version;
+        full_url << "&skin="    << curl_skin;
+
+        curl_free(curl_channel);
+        curl_free(curl_version);
+        curl_free(curl_skin);
+
+        news_bar->navigateTo( full_url.str() );
+
+
+        return true;
+}
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 15c2d28..386d201 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -84,6 +84,9 @@ public:
         static void setAlwaysRefresh(bool refresh); 
         static void mungePassword(LLUICtrl* caller, void* user_data);
         
+        /// Load the news bar web page, return true if successful.
+        bool loadNewsBar();
+
 private:
         static void onClickConnect(void*);
         static void onClickGrid(void*);
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index dda5e4d..a60beac 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -5,7 +5,7 @@
        follows="left|top|right|bottom" mouse_opaque="true" >
 
         <web_browser name="login_html" 
-               bottom="0" top="-1" left="0" right="-1"
+               bottom="102" top="600" left="0" right="800"
                border_visible="false" follows="top|left|bottom|right"
                      start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" />
         <string name="real_url">
@@ -19,7 +19,7 @@
   <!-- START LOCATION -->
 
         <text name="start_location_text" 
-              bottom="8" left="10" height="16" right="115"
+              bottom="32" left="10" height="16" right="115"
         follows="left|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -45,7 +45,7 @@
   <!-- FIRST NAME -->
 
         <text name="first_name_text" 
-              bottom="56" left="24" height="16" width="120"
+              bottom="80" left="24" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -106,7 +106,7 @@
   <!-- GRIDS -->
 
         <text name="grid_text" 
-              bottom="56" left_delta="150" height="16" width="120"
+              bottom="80" left_delta="150" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -126,7 +126,7 @@
   <!-- LOG IN -->
 
         <button name="connect_btn" label="Log In"
-          bottom="34" left_delta="140" height="24" width="120"
+          bottom="58" left_delta="140" height="24" width="120"
           follows="left|bottom" font="SansSerif" halign="center"
                 mouse_opaque="true" scale_image="TRUE" />
 
@@ -134,7 +134,7 @@
   <!-- ACCOUNT / FORGOT PASSWORD -->
 
         <text name="create_new_account_text"
-              bottom="45" left="-210" height="16" width="200"
+              bottom="69" left="-210" height="16" width="200"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -144,7 +144,7 @@
         </text>
 
         <text name="forgot_password_text"
-              bottom="25" left="-210" height="16" width="200"
+              bottom="49" left="-210" height="16" width="200"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -157,7 +157,7 @@
   <!-- CHANNEL & VERSION -->
 
         <text name="channel_text"
-              bottom="5" left="-310" height="16" width="300"
+              bottom="29" left="-310" height="16" width="300"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -165,4 +165,11 @@
         hover="true" hover_color="50 115 185">
     [CHANNEL] [VERSION]
   </text>
+
+
+  <web_browser name="news_bar"
+               bottom="0" top="20" left="0" right="800"
+               border_visible="true" follows="left|bottom|right"
+               start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
+
 </panel>