17 files changed, 188 insertions, 121 deletions

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 665a162..75ac62e 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_39)
+    set(BOOST_VERSION 1_43)
     if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
@@ -25,8 +25,6 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc80-mt-${BOOST_VERSION}
           debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-        # Default support for VS2008 was lost in the move from 1.36 to 1.39.  
-        # Remove this comment when this is fixed -- MC
     elseif (MSVC90)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 1669f7b..7be7bde 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -44,4 +44,4 @@ const std::string BUY_CURRENCY_URL (
 
 
 const std::string RELEASE_NOTES_BASE_URL (
-        "http://imprudenceviewer.org/wiki/Release_Notes/");
\ No newline at end of file
+        "http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/");
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index cf9de4b..03c6f6f 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -472,7 +472,7 @@ int main(int argc, char **argv)
                 err = CreateStandardAlert(
                                 kAlertStopAlert,
                                 CFSTR("Error"),
-                                CFSTR("An error occurred while updating Imprudence.  Please download the latest version from http://imprudenceviewer.org/download/"),
+                                CFSTR("An error occurred while updating Imprudence.  Please download the latest version from http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads"),
                                 &params,
                                 &alert);
                 
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 3f44e4b..802558a 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>26</string>
+      <key>default_grids_version</key><string>31</string>
     </map>
 
     <!-- Second Life -->
@@ -16,7 +16,7 @@
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>0</string>
+      <key>version</key><string>2</string>
     </map>
 
     <!-- Second Life Beta -->
@@ -31,7 +31,7 @@
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>1</string>
+      <key>version</key><string>3</string>
     </map>
 
     <!-- Local Host -->
@@ -57,22 +57,7 @@
       <key>support</key><string>http://osgrid.org/</string>
       <key>register</key><string>http://www.osgrid.org/index.php/auth/register</string>
       <key>password</key><string>http://www.osgrid.org/index.php/auth/forgot_password</string>
-      <key>version</key><string>1</string>
-    </map>
-
-    <!-- Legend City Online -->
-    <map>
-      <key>gridnick</key><string>legendcityonline</string>
-      <key>gridname</key><string>Legend City Online</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://login.legendcityonline.com</string>
-      <key>loginpage</key><string>http://www.legendcityonline.com/welcome.php</string>
-      <key>helperuri</key><string>https://secure.legendcityonline.com/</string>
-      <key>website</key><string>http://www.legendcityonline.com/</string>
-      <key>support</key><string>http://www.legendcityonline.com/</string>
-      <key>register</key><string>http://www.legendcityonline.com/</string>
-      <key>password</key><string>http://www.legendcityonline.com/</string>
-      <key>version</key><string>0</string>
+      <key>version</key><string>2</string>
     </map>
 
     <!-- WorldSimTerra -->
@@ -135,15 +120,17 @@
       <key>version</key><string>0</string>
     </map>
 
-    <!-- Cyberlandia -->
+    <!-- Craft (offspring of Cyberlandia) -->
     <map>
-      <key>gridnick</key><string>cyberlandia</string>
-      <key>gridname</key><string>Cyberlandia</string>
+      <key>gridnick</key><string>craft</string>
+      <key>gridname</key><string>Craft</string>
       <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.cyberlandia.net:8002</string>
-      <key>loginpage</key><string></string>
-      <key>helperuri</key><string></string>
-      <key>website</key><string>http://www.cyberlandia.net</string>
+      <key>loginuri</key><string>http://craft-world.org:8002/</string>
+      <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
+      <key>helperuri</key><string>http://webapp.craft-world.org/</string>
+      <key>website</key><string>http://www.craft-world.org/</string>
+      <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
+      <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
       <key>version</key><string>0</string>
     </map>
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2d9d810..ac8b236 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -219,7 +219,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org</string>
+    <string>http://blog.kokuaviewer.org</string>
   </map>
   <key>BrowserLastVisited</key>
   <map>
@@ -832,6 +832,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>
@@ -1369,7 +1380,7 @@
   <key>WarnFirstPrivacy</key>
   <map>
     <key>Comment</key>
-    <string>Enables FirstPrivacy warning on login</string>
+    <string>Warn about statistics packet when first logging in to Second Life.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1702,7 +1713,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org/app/client_list/</string>
+    <string>http://app.kokuaviewer.org/client_list/</string>
   </map>
 
   <key>WarnClientTags</key>
@@ -1967,7 +1978,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org/app/dics/</string>
+    <string>http://kokuaviewer.org/app/dics/</string>
   </map>
   <key>EmeraldEnableAutoCorrect</key>
   <map>
@@ -7725,7 +7736,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://imprudenceviewer.org/splash/</string>
+      <string></string>
     </map>
     <key>LogTextureDownloadsToViewerLog</key>
     <map>
diff --git a/linden/indra/newview/floatercommandline.cpp b/linden/indra/newview/floatercommandline.cpp
index 6889696..a700b62 100644
--- a/linden/indra/newview/floatercommandline.cpp
+++ b/linden/indra/newview/floatercommandline.cpp
@@ -32,7 +32,6 @@
 
 #include "floatercommandline.h"
 
-#include "hippogridmanager.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 
@@ -65,14 +64,6 @@ BOOL FloaterCommandLine::postBuild()
         childSetCommitCallback("CmdLineChatbarAO", onCommitApplyControl);
         childSetCommitCallback("CmdLineChatbarClearChat", onCommitApplyControl);
 
-        // hide options that don't work on non-SL-based grids
-        if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
-        {
-                childSetEnabled("CmdLineChatbarRezPlatform", FALSE);
-                childSetEnabled("loltxt6", FALSE);
-                childSetEnabled("CmdLineChatbarPlatformSize", FALSE);
-        }
-
         return TRUE;
 }
 
diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index d899f60..691508a 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -85,7 +85,9 @@ void HippoLimits::setOpenSimLimits()
 void HippoLimits::setSecondLifeLimits()
 {
         llinfos << "Using Second Life limits" << llendl;
-        mMaxAgentGroups = 25;
+        S32 max_groups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
+        mMaxAgentGroups = llmax(max_groups, 25);
+
         mMaxPrimScale = 10.0f;
         mMinPrimScale = 0.01f;
         mMaxHeight = 4096.0f;
diff --git a/linden/indra/newview/imprudence.url b/linden/indra/newview/imprudence.url
index 9cc3cc0..d90f3b2 100644
--- a/linden/indra/newview/imprudence.url
+++ b/linden/indra/newview/imprudence.url
@@ -1,2 +1,6 @@
 [InternetShortcut]
-URL=http://imprudenceviewer.org/wiki/Features
\ No newline at end of file
+URL=http://wiki.kokuaviewer.org/wiki/Imprudence:Features
+IDList=
+HotKey=0
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 6b98c8e..268c4c0 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -618,18 +618,16 @@ bool LLAppViewer::init()
 
     writeSystemInfo();
 
+
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", 
-        gSavedSettings.getString("VersionChannelName").c_str(), 
+        gCurrentVersion = llformat(
+                "%s %d.%d.%d.%d",
+                gSavedSettings.getString("VersionChannelName").c_str(),
                 ViewerVersion::getImpMajorVersion(), 
                 ViewerVersion::getImpMinorVersion(), 
                 ViewerVersion::getImpPatchVersion(),
-                ViewerVersion::getImpTestVersion().c_str(),
-                ViewerVersion::getLLViewerName().c_str(),
-                ViewerVersion::getLLMajorVersion(), 
-                ViewerVersion::getLLMinorVersion(), 
-                ViewerVersion::getLLPatchVersion(), 
-                ViewerVersion::getLLBuildVersion() );
+                0 // our 'build number'
+    );
 
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
@@ -2461,14 +2459,10 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["SLLog"] = LLError::logFileName();
 
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion();
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
+        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
 
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
 
@@ -2554,15 +2548,10 @@ void LLAppViewer::handleViewerCrash()
         //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
         //to check against no matter what
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-
-        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion();
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
+        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
 
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if ( parcel && parcel->getMusicURL()[0])
@@ -3288,7 +3277,7 @@ void LLAppViewer::badNetworkHandler()
                 "the issue. \n"
                 " \n"
                 "If the problem continues, please report the issue at: \n"
-                "http://imprudenceviewer.org" << grid_support_msg;
+                "http://redmine.kokuaviewer.org/projects/imprudence" << grid_support_msg;
         forceDisconnect(message.str());
 }
 
@@ -4334,11 +4323,11 @@ void LLAppViewer::handleLoginComplete()
 
         // Store some data to DebugInfo in case of a freeze.
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
+        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
 
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion();
         gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index db086bf..7388e7f 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -302,17 +302,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");
@@ -327,6 +316,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         refreshLocation( false );
 #endif
 
+        loadNewsBar();
+
         LLFirstUse::useLoginScreen();
 }
 
@@ -419,13 +410,20 @@ void LLPanelLogin::draw()
                 S32 width = getRect().getWidth();
                 S32 height = getRect().getHeight();
 
+                S32 news_bar_height = 0;
+                LLMediaCtrl* news_bar = getChild<LLMediaCtrl>("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
@@ -1164,3 +1162,75 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
         }
 }
 */
+
+
+bool LLPanelLogin::loadNewsBar()
+{
+        std::string news_url = gSavedSettings.getString("NewsBarURL");
+
+        if (news_url.empty())
+        {
+                return false;
+        }
+
+        LLMediaCtrl* news_bar = getChild<LLMediaCtrl>("news_bar");
+
+        if (!news_bar)
+        {
+                return false;
+        }
+
+        // *HACK: Not sure how else to make LLMediaCtrl 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 c99fa30..5830b52 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -87,6 +87,9 @@ public:
         // inherited from LLViewerMediaObserver
         /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
+        /// 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/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4bfcf52..bd94a59 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1776,8 +1776,15 @@ bool idle_startup()
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("directory_fee");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str()));
+
+                        //OpenSim
                         tmp = LLUserAuth::getInstance()->getResponse("max_groups");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
+
+                        //SL
+                        tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
+
                         tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp);
                         gHippoGridManager->saveFile();
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index ef02bfa..db4e11d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -9,7 +9,7 @@
   word_wrap="true">
   The Imprudence Viewer was rocked hard by:
   Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
-  http://imprudenceviewer.org
+  http://kokuaviewer.org/
   
   Imprudence is so awesome thanks to contributions from many generous people:
   
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c2424d7..c2afe40 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -827,12 +827,12 @@
     <menu_item_call name="Imprudence Blog"
                     label="Imprudence Blog">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+                userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
     </menu_item_call>
     <menu_item_call name="Imprudence Forums"
                     label="Imprudence Forums">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+                userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Portal"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index d4d86c0..e3b6364 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?><notifications>
 
 <global name="VIEWER_NAME">Imprudence</global>
-<global name="VIEWER_SITE">imprudenceviewer.org</global>
+<global name="VIEWER_SITE">kokuaviewer.org</global>
 <global name="SECOND_LIFE">Second Life</global>
 <global name="SECOND_LIFE_SITE">secondlife.com</global>
 
@@ -6870,7 +6870,7 @@ The region you have entered is running a different simulator version. Click this
  icon="notify.tga"
  name="QueryClientTags"
  type="notify">
-Would you like to have the client tag database automatically updated from imprudenceviewer.org?
+Would you like to have the client tag database automatically updated from kokuaviewer.org?
 
 This ensures that you have the latest information available regarding other clients.
   <form name="form">
@@ -6942,7 +6942,7 @@ GRAVITY  --  -9.8
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Build_Math_Expressions
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
   </url>
   <usetemplate
    name="okhelpbuttons"
@@ -6971,7 +6971,7 @@ GLOW --  Glow
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Build_Math_Expressions
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
   </url>
   <usetemplate
    name="okhelpbuttons"
@@ -7088,7 +7088,7 @@ WARNING: Don't restore if you aren't sure where the object will go!
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Restore_to_Last_Position
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Restore_to_Last_Position
   </url>
   <usetemplate
    name="okcancelhelpignore"
@@ -7285,22 +7285,20 @@ The new font will appear after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
  name="FirstPrivacy"
+ icon="alertmodal.tga"
  type="alertmodal">
-Terms of service of the grid you are connecting to require sending a "statistics packet" every 5 minutes.
-That is for example: Data about your hardware (CPU, RAM), number of avatars around, number of sims visited.
-Please check *the grids* privacy policy about usage of that data.
-  <form name="form">
-          <button
-                 index="0"
-                 name="ok"
-                 text="Login anyway"/>
-          <button
-                 index="1"
-                 name="notok"
-                 text="Do not log in"/>
-  </form>
+Attention: The Second Life Terms of Service require that all viewers, including the Imprudence Viewer, send a "statistics packet" to Linden Lab every 5 minutes while you are connected to Second Life.
+
+The packet includes non-personally-identifying data about your computer and your Second Life usage, such as your computer hardware and operating system, average framerate, number of sims visited, number of avatars nearby, and more. Please check the Second Life Privacy Policy for information about how Linden Lab uses this and other data.
+
+The packet is sent only to Linden Lab; the Imprudence Project does not receive or collect any data of this kind.
+
+The Second Life Terms of Service do not allow you to opt out. By logging in to Second Life, you are consenting to this data collection.
+  <usetemplate
+   name="okcancelbuttons"
+   yestext="Log In"
+   notext="Cancel"/>
 </notification>
 
 <!--End Imprudence notifications-->
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 048005d..16dd4ad 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="-1" left="0" right="-1"
                          border_visible="false" follows="top|left|bottom|right"
                          start_url="data:text/html,
                          %3Chtml%3E
@@ -33,7 +33,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"
@@ -59,7 +59,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"
@@ -123,7 +123,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"
@@ -143,7 +143,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" />
 
@@ -151,7 +151,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"
@@ -161,7 +161,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"
@@ -174,7 +174,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"
@@ -182,4 +182,11 @@
         hover="true" hover_color="50 115 185">
     [CHANNEL] [VERSION]
   </text>
+
+
+  <web_browser name="news_bar"
+               bottom="0" top="20" left="0" right="-1"
+               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>
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index c6fa3c8..8c26ade 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -459,7 +459,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
                         L"The Imprudence auto-update has failed.\n"
                         L"The problem may be caused by other software installed \n"
                         L"on your computer, such as a firewall.\n"
-                        L"Please visit http://imprudenceviewer.org/download/ \n"
+                        L"Please visit http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads \n"
                         L"to download the latest version of Imprudence.\n",
                         NULL, MB_OK);
                 return 1;