11 files changed, 260 insertions, 42 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 7077dde..313f0c4 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -69,6 +69,7 @@ set(viewer_SOURCE_FILES
     emeraldboobutils.cpp
     floaterao.cpp
     floaterbusy.cpp
+    floatergriddefault.cpp
     floatergridmanager.cpp
     hbfloatergrouptitles.cpp
     hippoGridManager.cpp
@@ -501,6 +502,7 @@ set(viewer_HEADER_FILES
     emeraldboobutils.h
     floaterao.h
     floaterbusy.h
+    floatergriddefault.h
     floatergridmanager.h
     hbfloatergrouptitles.h
     hippoGridManager.h
@@ -1121,6 +1123,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_camera.xml
     skins/default/xui/en-us/floater_chat_history.xml
     skins/default/xui/en-us/floater_chatterbox.xml
+    skins/default/xui/en-us/floater_chatterbox_vertical.xml
     skins/default/xui/en-us/floater_choose_group.xml
     skins/default/xui/en-us/floater_color_picker.xml
     skins/default/xui/en-us/floater_critical.xml
@@ -1132,6 +1135,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_font_test.xml
     skins/default/xui/en-us/floater_gesture.xml
     skins/default/xui/en-us/floater_god_tools.xml
+    skins/default/xui/en-us/floater_grid_default_selector.xml
     skins/default/xui/en-us/floater_grid_manager.xml
     skins/default/xui/en-us/floater_group_info.xml
     skins/default/xui/en-us/floater_group_titles.xml
@@ -1155,6 +1159,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_live_lsleditor.xml
     skins/default/xui/en-us/floater_lsl_guide.xml
     skins/default/xui/en-us/floater_media_browser.xml
+    skins/default/xui/en-us/floater_mem_leaking.xml
     skins/default/xui/en-us/floater_mini_map.xml
     skins/default/xui/en-us/floater_moveview.xml
     skins/default/xui/en-us/floater_mute_object.xml
@@ -1190,11 +1195,13 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_region_info.xml
     skins/default/xui/en-us/floater_report_abuse.xml
     skins/default/xui/en-us/floater_report_bug.xml
+    skins/default/xui/en-us/floater_rlv_behaviour.xml
     skins/default/xui/en-us/floater_script_debug.xml
     skins/default/xui/en-us/floater_script_ed_panel.xml
     skins/default/xui/en-us/floater_script_preview.xml
     skins/default/xui/en-us/floater_script_queue.xml
     skins/default/xui/en-us/floater_script_search.xml
+    skins/default/xui/en-us/floater_search_replace.xml
     skins/default/xui/en-us/floater_select_key.xml
     skins/default/xui/en-us/floater_sell_land.xml
     skins/default/xui/en-us/floater_settings_debug.xml
@@ -1304,6 +1311,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/role_actions.xml
     skins/default/xui/en-us/strings.xml
     skins/default/xui/en-us/teleport_strings.xml
+    skins/default/xui/en-us/ui_strings.xml
     skins/default/xui/en-us/xui_version.xml
     )
 
@@ -1316,6 +1324,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 
 set(viewer_APPSETTINGS_FILES
     app_settings/anim.ini
+    app_settings/ao_template.ini
     app_settings/cmd_line.xml
     app_settings/grass.xml
     app_settings/high_graphics.xml
diff --git a/linden/indra/newview/app_settings/ao_template.ini b/linden/indra/newview/app_settings/ao_template.ini
index d35b2ee..33b530a 100644
--- a/linden/indra/newview/app_settings/ao_template.ini
+++ b/linden/indra/newview/app_settings/ao_template.ini
@@ -1,9 +1,9 @@
-############################################################
-############################################################
+###############################################
+###############################################
 ##                          
 ##  IMPRUDENCE AO TEMPLATE  
 ##                          
-############################################################
+###############################################
 ##
 ## INSTRUCTIONS:
 ##
@@ -33,15 +33,15 @@
 ## 
 ## 8. Press the "Reload" button in the AO.
 ## 
-############################################################
+###############################################
 
-############################################################
-############################################################
+###############################################
+###############################################
 ##                          
 ##   LIST YOUR ANIMATIONS HERE   
 ##                          
-############################################################
-############################################################
+###############################################
+###############################################
 
 
 [ Standing ]
@@ -61,20 +61,14 @@
 [ Jumping ]
 [ Pre Jumping ]
 [ Running ]
-[ Turning Right ]
-[ Turning Left ]
-[ Floating ]
-[ Swimming Forward ]
-[ Swimming Up ]
-[ Swimming Down ]
 
 
-#############################################################
-#############################################################
+###############################################
+###############################################
 ##                           
 ##  FOR ADVANCED USERS ONLY  
 ##                           
-#############################################################
+###############################################
 ##
 ## Lines starting with a # are treated as comments and ignored. Blank lines are ignored. Valid lines look like this:
 ##
@@ -100,4 +94,4 @@
 ## 
 ## Imprudence's AO notecard system is based on the ZHAO-II HUD by Second Life resident Ziggy Puff.
 ##
-############################################################
\ No newline at end of file
+###############################################
\ No newline at end of file
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c144f95..9c95b1f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -844,6 +844,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>WarnFirstLoginScreen</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables default grid selector on FirstLoginScreen</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>WarnFirstMiniMap</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/floatergriddefault.cpp b/linden/indra/newview/floatergriddefault.cpp
new file mode 100644
index 0000000..2c853df
--- /dev/null
+++ b/linden/indra/newview/floatergriddefault.cpp
@@ -0,0 +1,102 @@
+/**
+* @file floatergriddefault.cpp
+* @brief prompts user to set the default grid on first use
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "floatergriddefault.h"
+
+#include "hippoGridManager.h"
+#include "llpanellogin.h"
+#include "llscrolllistctrl.h"
+#include "lluictrlfactory.h"
+
+FloaterGridDefault::FloaterGridDefault(const LLSD& key)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_grid_default_selector.xml");
+}
+
+FloaterGridDefault::~FloaterGridDefault()
+{
+}
+
+BOOL FloaterGridDefault::postBuild()
+{
+        // populate the grid chooser
+        LLScrollListCtrl* grid_list = getChild<LLScrollListCtrl>("grid_list");
+        grid_list->deleteAllItems();
+
+        LLSD element;
+
+        for (HippoGridManager::GridIterator it = gHippoGridManager->beginGrid(); it != gHippoGridManager->endGrid(); ++it) 
+        {
+                std::string grid_nick = it->second->getGridNick();
+                // There's no reason why empty grids nicks should be in this list, ugh
+                if (!grid_nick.empty()) 
+                {
+                        element["id"] = grid_nick;
+                        element["columns"][0]["column"] = "grid";
+                        element["columns"][0]["type"] = "text";
+                        element["columns"][0]["value"] = grid_nick;
+                        grid_list->addElement(element, ADD_BOTTOM);
+                }
+        }
+
+        grid_list->setFocus(TRUE);
+
+        childSetAction("btn_ok", onClickOK, this);
+        childSetAction("btn_cancel", onClickCancel, this);
+
+        return TRUE;
+}
+
+// static
+void FloaterGridDefault::onClickOK(void* userdata)
+{
+        FloaterGridDefault* self = (FloaterGridDefault*)userdata;
+
+        LLScrollListCtrl* grid_list = self->getChild<LLScrollListCtrl>("grid_list");
+        std::string selected = grid_list->getFirstSelected()->getValue().asString();
+
+        if (!selected.empty() || selected != gHippoGridManager->getCurrentGridNick())
+        {
+                gHippoGridManager->setDefaultGrid(selected);
+                gHippoGridManager->setCurrentGridAsConnected();
+                gHippoGridManager->saveFile();
+                LLPanelLogin::updateGridCombo(selected);
+        }
+        self->close();
+}
+
+// static
+void FloaterGridDefault::onClickCancel(void* userdata)
+{
+        FloaterGridDefault* self = (FloaterGridDefault*)userdata;
+        self->close();
+}
diff --git a/linden/indra/newview/floatergriddefault.h b/linden/indra/newview/floatergriddefault.h
new file mode 100644
index 0000000..009e23f
--- /dev/null
+++ b/linden/indra/newview/floatergriddefault.h
@@ -0,0 +1,49 @@
+/**
+* @file floatergriddefault.h
+* @brief prompts user to set the default grid on first use
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef FLOATERGRIDDEFAULT_H
+#define FLOATERGRIDDEFAULT_H
+
+#include "llfloater.h"
+
+class FloaterGridDefault : public LLFloater, public LLFloaterSingleton<FloaterGridDefault>
+{
+public:
+        FloaterGridDefault(const LLSD& key);
+        ~FloaterGridDefault();
+
+        /*virtual*/ BOOL postBuild();
+
+private:
+        static void onClickOK(void* userdata);
+        static void onClickCancel(void* userdata);
+};
+
+#endif // FLOATERGRIDDEFAULT_H
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index cba1af1..db2854d 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1827,6 +1827,7 @@ bool LLAppViewer::initConfiguration()
         LLFirstUse::addConfigVariable("FirstSculptedPrim");
         LLFirstUse::addConfigVariable("FirstVoice");
         LLFirstUse::addConfigVariable("FirstMedia");
+        LLFirstUse::addConfigVariable("FirstLoginScreen");
                 
         // - read command line settings.
         LLControlGroupCLP clp;
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 34e3fcc..c0f07e5 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -46,6 +46,7 @@
 #include "lltracker.h"
 
 #include "llvoavatar.h"
+#include "floatergriddefault.h"
 #include "hippoGridManager.h"
 
 // [RLVa:KB] - Version: 1.22.11
@@ -308,6 +309,7 @@ void LLFirstUse::useMedia()
                 LLNotifications::instance().add("FirstMedia");
         }
 }
+
 void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response)
 {
         gSavedSettings.setWarning("ClientTags", FALSE);
@@ -331,6 +333,7 @@ void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& respon
                 gSavedSettings.setBOOL("DownloadClientTags",FALSE);
         }
 }
+
 // static
 void LLFirstUse::ClientTags()
 {
@@ -340,3 +343,14 @@ void LLFirstUse::ClientTags()
         }
 }
 
+// static 
+void LLFirstUse::useLoginScreen()
+{
+        if (gSavedSettings.getWarning("FirstLoginScreen"))
+        {
+                gSavedSettings.setWarning("FirstLoginScreen", FALSE);
+
+                FloaterGridDefault::getInstance()->open();
+                FloaterGridDefault::getInstance()->center();
+        }
+}
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index 6467734..bd44ece 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -112,6 +112,7 @@ public:
         static void useDebugMenus();
         static void useSculptedPrim();
         static void useMedia();
+        static void useLoginScreen();
         static void callbackClientTags(const LLSD& notification, const LLSD& response);
         static void ClientTags();
         
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index a95272a..460c67f 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -52,6 +52,7 @@
 #include "llcombobox.h"
 #include "llcurl.h"
 #include "llviewercontrol.h"
+#include "llfirstuse.h"
 #include "llfloaterabout.h"
 #include "llfloatertest.h"
 #include "llfloaterpreference.h"
@@ -329,6 +330,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         refreshLocation( false );
 #endif
 
+        LLFirstUse::useLoginScreen();
 }
 
 void LLPanelLogin::setSiteIsAlive( bool alive )
@@ -801,9 +803,12 @@ void LLPanelLogin::refreshLoginPage()
     // kick off a request to grab the url manually
         gResponsePtr = LLIamHereLogin::build(sInstance);
         std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
-        if (!login_page.empty()) {
+        if (!login_page.empty()) 
+        {
                 LLHTTPClient::head(login_page, gResponsePtr);
-        } else {
+        } 
+        else 
+        {
                 sInstance->setSiteIsAlive(false);
         }
 }
@@ -815,7 +820,8 @@ void LLPanelLogin::loadLoginPage()
         
 
         std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
-        if (login_page.empty()) {
+        if (login_page.empty()) 
+        {
                 sInstance->setSiteIsAlive(false);
                 return;
         }
@@ -1092,35 +1098,45 @@ void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
         // *NOTE: The paramters for this method are ignored. 
         // LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
         // calls this method.
+        updateGridCombo(LLStringUtil::null);
+}
 
-        // The user twiddled with the grid choice ui.
-        // apply the selection to the grid setting.
-        std::string grid_label;
-        //S32 grid_index;
-
+// static
+void LLPanelLogin::updateGridCombo(std::string grid_nick)
+{
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        LLSD combo_val = combo->getValue();
-
-        std::string mCurGrid = ctrl->getValue().asString();
-        //KOW
-        gHippoGridManager->setCurrentGrid(mCurGrid);
-        // HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
-        // if (gridInfo) {
-        //      //childSetText("gridnick", gridInfo->getGridNick());
-        //      //platform->setCurrentByIndex(gridInfo->getPlatform());
-        //      //childSetText("gridname", gridInfo->getGridName());
-        //      LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
-        // }
-        if (mCurGrid == gHippoGridManager->getConnectedGrid()->getGridNick())
-                gHippoLimits->setLimits();
+
+        if (grid_nick.empty())
+        {
+                // The user twiddled with the grid choice ui.
+                // apply the selection to the grid setting.
+                //std::string grid_label;
+                //S32 grid_index;
+                
+                grid_nick = combo->getValue().asString();
+                
+                // HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
+                // if (gridInfo) {
+                //      //childSetText("gridnick", gridInfo->getGridNick());
+                //      //platform->setCurrentByIndex(gridInfo->getPlatform());
+                //      //childSetText("gridname", gridInfo->getGridName());
+                //      LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
+                // }
+        }
+        else
+        {
+                combo->setSimple(grid_nick);
+        }
         
-        llwarns << "current grid = " << mCurGrid << llendl;
+        gHippoGridManager->setCurrentGrid(grid_nick);
+
+        llinfos << "current grid set to " << grid_nick << llendl;
 
         // grid changed so show new splash screen (possibly)
         loadLoginPage();
 
         // save grid choice to settings
-        gSavedSettings.setString("LastSelectedGrid", mCurGrid);
+        gSavedSettings.setString("LastSelectedGrid", grid_nick);
 }
 /*
 void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index f2c589d..15c2d28 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -65,6 +65,8 @@ public:
 
         static void addServer(const std::string& server);
         static void refreshLocation( bool force_visible );
+        // Updates grid combo at login screen with a specific nick. Use an empty string to refresh
+        static void updateGridCombo(std::string grid_nick);
 
         static void getFields(std::string *firstname, std::string *lastname,
                                                   std::string *password);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
new file mode 100644
index 0000000..2cf9cd7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
+     height="350" min_height="350" min_width="250" name="default_grid"
+     title="Select a Default Grid" width="250">
+  <text top="-18" follows="top|left" font="SansSerifSmall" left="10"
+      halign="left" h_pad="0" v_pad="0" height="16" name="select_label">
+    Or use the Grid Manager to add a new one
+  </text>
+  <scroll_list background_visible="true" bottom_delta="30" draw_border="true"
+      draw_stripes="false" sort_column="0"
+      follows="top|left|bottom" height="280" left="10" multi_select="false"
+      name="grid_list" width="230">
+    <column label="" name="grid" width="230" />
+  </scroll_list>
+  <button bottom="5" follows="bottom|right" height="20" label="Cancel"
+      right="-5" name="btn_cancel" width="85" />
+  <button bottom_delta="0" follows="bottom|right" height="20" label="OK"
+            left_delta="-90" name="btn_ok" width="85" />
+</floater>
\ No newline at end of file