From 46bd7a520b7f026765e1c3db9d0cbf0132407c97 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Wed, 19 Jan 2011 13:49:50 -0800
Subject: [PATCH 01/15] Initial port of disabling TP/login/logout progress
 screens. Bugs: Chat history seems to want to open if login progress screen is
 disabled. (BSD)

---
 indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++
 indra/newview/llappviewer.cpp           |  4 +--
 indra/newview/llstartup.cpp             | 25 ++++++++++++++++---
 indra/newview/llviewerdisplay.cpp       | 14 ++++++++---
 4 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8bf6699704..e60ae3bb63 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12921,5 +12921,38 @@
 		  <key>Value</key>
 		  <integer>0</integer>
 		</map>
+		<key>PhoenixDisableLoginScreens</key>
+		<map>
+			<key>Comment</key>
+			<string>Disable login screen progress bar</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>1</integer>
+		</map>
+		<key>PhoenixDisableLogoutScreens</key>
+		<map>
+			<key>Comment</key>
+			<string>Disable logout screen progress bar</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>1</integer>
+		</map>
+		<key>PhoenixDisableTeleportScreens</key>
+		<map>
+			<key>Comment</key>
+			<string>Disable teleport screens</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>1</integer>
+		</map>
 </map>
 </llsd>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 47e27f822c..55a53d04d6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4106,7 +4106,7 @@ void LLAppViewer::idleShutdown()
 		static S32 total_uploads = 0;
 		// Sometimes total upload count can change during logout.
 		total_uploads = llmax(total_uploads, pending_uploads);
-		gViewerWindow->setShowProgress(TRUE);
+		gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLogoutScreens"));
 		S32 finished_uploads = total_uploads - pending_uploads;
 		F32 percent = 100.f * finished_uploads / total_uploads;
 		gViewerWindow->setProgressPercent(percent);
@@ -4120,7 +4120,7 @@ void LLAppViewer::idleShutdown()
 		sendLogoutRequest();
 
 		// Wait for a LogoutReply message
-		gViewerWindow->setShowProgress(TRUE);
+		gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLogoutScreens"));
 		gViewerWindow->setProgressPercent(100.f);
 		gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
 		return;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 2dd7383b2b..0ffb6094b0 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -265,6 +265,7 @@ void trust_cert_done(const LLSD& notification, const LLSD& response);
 void apply_udp_blacklist(const std::string& csv);
 bool process_login_success_response();
 void transition_back_to_login_panel(const std::string& emsg);
+void cmdline_printchat(std::string message);
 
 void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
 {
@@ -949,7 +950,7 @@ bool idle_startup()
 		}
 
 		// Display the startup progress bar.
-		gViewerWindow->setShowProgress(TRUE);
+		gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLoginScreens"));
 		gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
 
 		// Poke the VFS, which could potentially block for a while if
@@ -2132,10 +2133,26 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
 
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
 {
-	gViewerWindow->setProgressPercent(frac*100);
-	gViewerWindow->setProgressString(string);
+	if(gSavedSettings.getBOOL("PhoenixDisableLoginScreens"))
+	{
+		static std::string last_d;
+		std::string new_d = string;
+		if(new_d != last_d)
+		{
+			last_d = new_d;
+			cmdline_printchat(new_d);
+			if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake"))
+			{
+				cmdline_printchat(msg);
+			}
+		}
+	}else
+	{
+		gViewerWindow->setProgressPercent(frac*100);
+		gViewerWindow->setProgressString(string);
 
-	gViewerWindow->setProgressMessage(msg);
+		gViewerWindow->setProgressMessage(msg);
+	}
 }
 
 bool login_alert_status(const LLSD& notification, const LLSD& response)
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index a864ae09db..642a942745 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -380,8 +380,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// Transition to REQUESTED.  Viewer has sent some kind
 			// of TeleportRequest to the source simulator
 			gTeleportDisplayTimer.reset();
-			gViewerWindow->setShowProgress(TRUE);
-			gViewerWindow->setProgressPercent(0);
+			if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+			{
+				gViewerWindow->setShowProgress(TRUE);
+				gViewerWindow->setProgressPercent(0);
+			}
 			gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
 			gAgent.setTeleportMessage(
 				LLAgent::sTeleportProgressMessages["requesting"]);
@@ -408,14 +411,17 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			gAgent.setTeleportMessage(
 				LLAgent::sTeleportProgressMessages["arriving"]);
 			gTextureList.mForceResetTextureStats = TRUE;
-			gAgentCamera.resetView(TRUE, TRUE);
+			if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+			{
+				gAgentCamera.resetView(TRUE, TRUE);
+			}
 			break;
 
 		case LLAgent::TELEPORT_ARRIVING:
 			// Make the user wait while content "pre-caches"
 			{
 				F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY);
-				if( arrival_fraction > 1.f )
+				if( arrival_fraction > 1.f || gSavedSettings.getBOOL("PhoenixDisableTeleportScreens") )
 				{
 					arrival_fraction = 1.f;
 					//LLFirstUse::useTeleport();

From 748cfa8cd8ca2b68a0f34ff53b85a6939bff7701 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 23 Jan 2011 18:38:51 -0500
Subject: [PATCH 02/15] Branching for Preview Release #1

--HG--
branch : Firestorm_2.4.1
---
 indra/Version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/Version b/indra/Version
index f0f2bb5105..7a40912e47 100644
--- a/indra/Version
+++ b/indra/Version
@@ -1 +1 @@
-VERSION_VIEWER=2.4.0
+VERSION_VIEWER=2.4.1

From 2b7b9cd2d769f5069af2e8e9101603baf1f9a1be Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Mon, 24 Jan 2011 01:23:15 -0500
Subject: [PATCH 03/15] Tank_Master - V1 style chat should be the default

--HG--
branch : Firestorm_2.4.1
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 73428cb36e..1db273e75e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6620,7 +6620,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     
     <key>PluginInstancesLow</key>

From a32861fc6d938fdd45e77e02b72726dafc968513 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Mon, 24 Jan 2011 01:26:28 -0500
Subject: [PATCH 04/15] More details / clarity for preference settings

--HG--
branch : Firestorm_2.4.1
---
 .../skins/default/xui/en/panel_preferences_advanced.xml     | 6 +++---
 .../newview/skins/default/xui/en/panel_preferences_chat.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6ebabb6a4d..1a3eea5d05 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -47,7 +47,7 @@
      control_name="AllowMultipleViewers"
      follows="top|left"
      height="15"
-     label="Allow Multiple Viewer"
+     label="Allow Multiple Viewers (May reduce stability and performance)"
      layout="topleft"
      left="30"
      name="allow_multiple_viewer_check"
@@ -57,7 +57,7 @@
      control_name="ForceShowGrid"
      follows="top|left"
      height="15"
-     label="Show Grid Selection at login"
+     label="Allow login to other grids (Not all grids will support Firestorm)"
      layout="topleft"
      left="30"
      name="show_grid_selection_check"
@@ -67,7 +67,7 @@
      control_name="UseDebugMenus"
      follows="top|left"
      height="15"
-     label="Show Advanced Menu"
+     label="Show Advanced Menu (Use at own risk!)"
      layout="topleft"
      left="30"
      name="show_advanced_menu_check"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 693c33be55..3c72a282a2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -81,7 +81,7 @@
      control_name="ShowChatMiniIcons"
      height="16"
      initial_value="false"
-     label="Show avatar icons within chat history"
+     label="Show icons in chat headers"
      layout="topleft"
      left="30"
      name="ShowChatMiniIcons"
@@ -99,7 +99,7 @@
     <check_box
      enabled="true"
      height="16"
-     label="Enable plain text IM and chat history"
+     label="Remove chat headers (V1 Style)"
      layout="topleft"
      left_delta="0"
      name="plain_text_chat_history"

From dea1394a01d59770a20154cd637f5b55070f8103 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Mon, 24 Jan 2011 04:20:44 -0500
Subject: [PATCH 05/15] Updated Featuretable

--HG--
branch : Firestorm_2.4.1
---
 FIRESTORM-FEATURETABLE.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index 049e4a186b..cc36f70eb8 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -43,4 +43,8 @@ Hippos!			LGPL
 V1_MouseCursors		LGPL/Creative Commons Attribution-Share Alike 3.0
 V1_Icons			Creative Commons Attribution-Share Alike 3.0
 AFK_ExtraControls	LGPL
-IgnoreFinishAnimation	BSD/PD
\ No newline at end of file
+IgnoreFinishAnimation	BSD/PD
+Comm_Contacts_Tab	LGPL
+QuickAdditionalInv	LGPL
+UpdatedLibCURL		Curl (MIT/X11)
+UpdatedWebKit		LGPL

From 00d0f388202d6baab7eb79a12f11545009403f5a Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Mon, 24 Jan 2011 10:44:23 -0500
Subject: [PATCH 06/15] Bottom tray now pops up inventory sidepanel, inventory
 sidepanel has button for secondary floater

--HG--
branch : Firestorm_2.4.1
---
 indra/newview/llbottomtray.cpp                |   6 ++
 .../skins/default/xui/en/panel_bottomtray.xml |  63 ++++++++---
 .../default/xui/en/panel_main_inventory.xml   |  82 +++++++++-----
 .../skins/default/xui/en/panel_status_bar.xml |   1 +
 .../default/xui/en/sidepanel_inventory.xml    |   2 +-
 .../firestorm/xui/en/panel_bottomtray.xml     | 100 ++++++++++++------
 .../metaharper/xui/en/panel_bottomtray.xml    |  61 ++++++++---
 .../xui/en/panel_main_inventory.xml           |  82 +++++++++-----
 .../metaharper/xui/en/sidepanel_inventory.xml |   4 +-
 9 files changed, 281 insertions(+), 120 deletions(-)

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 4e69cf2d74..3ff8c705fc 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -577,6 +577,7 @@ BOOL LLBottomTray::postBuild()
 	getChild<LLUICtrl>("sidebar_people_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "panel_people"));
 	getChild<LLUICtrl>("sidebar_places_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "panel_places"));
 	getChild<LLUICtrl>("sidebar_appearance_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "sidepanel_appearance"));
+	getChild<LLUICtrl>("sidebar_inv_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "sidepanel_inventory"));
 	return TRUE;
 }
 
@@ -887,6 +888,11 @@ void LLBottomTray::showSidebarPanel(const std::string& panel_name)
 		tab_name = "sidebar_appearance";
 		btn = getChild<LLButton>("sidebar_appearance_btn");
 	}
+	else if (panel_name == "sidepanel_inventory")
+	{
+		tab_name = "sidebar_inventory";
+		btn = getChild<LLButton>("sidebar_inv_btn");
+	}
 	
 	// toggle minimization undocked
 	LLFloater* floater_tab = LLFloaterReg::getInstance("side_bar_tab", tab_name);
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 56b852c1ad..be2bbcb985 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -380,9 +380,7 @@
          name="build_btn_panel"
          user_resize="false"
          width="40">
-<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
-Disabled for now.
--->
+
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -496,19 +494,8 @@ Disabled for now.
                  parameter="mini_map" />
             </bottomtray_button>
         </layout_panel>
-        <icon
-         auto_resize="false"
-         color="Transparent"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="3"
-         name="after_inventory_button"
-         top="0"
-         width="3"/>
-        
+
+<!--        
          <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -540,8 +527,50 @@ Disabled for now.
                  parameter="inventory" />
             </button>
         </layout_panel>
+-->
 
-        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbinv"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="inventory_18"
+             layout="topleft"
+             left="0"
+             name="sidebar_inv_btn"
+             tool_tip="Shows/hides inventory"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+
+        <icon
+         auto_resize="false"
+         color="Transparent"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="3"
+         name="after_inventory_button"
+         top="0"
+         width="3"/>        
         
         <layout_panel
          follows="left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 4a7b3b343e..86f38016b3 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -34,7 +34,7 @@
     		 left="12"
 		     name="ItemcountText"
 		     font="SansSerifMedium"
-		     text_color="EmphasisColor"
+		     text_color="SchemeLightest"
 		     top_pad="0"
 		     width="300">
     Items:
@@ -118,25 +118,25 @@
 	 show_item_link_overlays="true"
      width="290" />
   </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
+  <panel
    follows="left|right|bottom"
+   auto_resize="true"
    height="25"
    layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
+   top_pad="-3"
+   left="9"
    name="bottom_panel"
-   width="307">
-      <layout_panel
+   width="315">
+      <panel
        auto_resize="false"
+       follows="top|left"
        height="25"
+       left="0"
        layout="topleft"
        name="options_gear_btn_panel"
        width="32">
           <menu_button
-           follows="bottom|left"
+           follows="top|left"
            tool_tip="Show additional options"
            height="25"
            image_hover_unselected="Toolbar_Left_Over"
@@ -148,15 +148,17 @@
            name="options_gear_btn"
            top="0"
            width="31" />
-      </layout_panel>
-      <layout_panel
+      </panel>
+      <panel
+       follows="top|left"
        auto_resize="false"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="add_btn_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="AddItem_Off"
@@ -168,31 +170,61 @@
            tool_tip="Add new item"
            top="0"
            width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
+      </panel>
+      <panel
+       follows="top|left"
+       auto_resize="false"
        height="25"
        layout="topleft"
+       left_pad="0"
+       name="new_inventory_panel"
+       width="32">
+          <button
+           follows="top|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="inventory_18"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="new_inv_btn"
+           tool_tip="Additional Inventory Window"
+           top="0"
+           width="31">
+           <button.init_callback
+                 function="Button.SetDockableFloaterToggle"
+                 parameter="inventory" />
+           </button>
+      </panel>
+      <panel
+       follows="top|left|right"
+       auto_resize="true"
+       height="25"
+       left_pad="0"
+       layout="topleft"
        name="dummy_panel"
-       width="212">
+       width="183">
           <icon
-           follows="bottom|left|right"
+           follows="top|left|right"
            height="25"
            image_name="Toolbar_Middle_Off"
            layout="topleft"
            left="0"
            top="0"
            name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
+           width="182" />
+      </panel>
+      <panel
        auto_resize="false"
+       follows="top|right"
        height="25"
+       left_pad="0"
        layout="topleft"
        name="trash_btn_panel"
-       width="31">
+       width="32">
           <dnd_button
-           follows="bottom|left"
+           follows="top|right"
            height="25"
            image_hover_unselected="Toolbar_Right_Over"
            image_overlay="TrashItem_Off"
@@ -204,6 +236,6 @@
            tool_tip="Remove selected item"
            top="0"
            width="31"/>
-      </layout_panel>
-  </layout_stack>
+       </panel>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index e5d97dbf05..c71e35f0bb 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -222,6 +222,7 @@
     </button>
     <button
      follows="right|top"
+     control="MuteAudio"
      height="16"
      image_selected="AudioMute_Off"
      image_pressed="Audio_Press"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index f3c6895cee..5a854c459c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -106,7 +106,7 @@
                          enabled="true"
                          follows="bottom|left|right"
                          height="23"
-                         label="Shop"
+                         label="Marketplace"
                          layout="topleft"
                          left="0"
                          name="shop_btn"
diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
index ff42157794..ff17155fd6 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
@@ -496,6 +496,72 @@ Disabled for now.
          parameter="mini_map" />
       </bottomtray_button>
     </layout_panel>
+
+
+        <!--
+         <layout_panel
+         mouse_opaque="false"
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         name="inventory_panel"
+         user_resize="false"
+         width="40">
+            <button
+                 image_selected="PushButton_Selected_Press"
+                 image_pressed="PushButton_Press"
+                 image_pressed_selected="PushButton_Selected_Press"
+             follows="left|right"
+             height="23"
+             use_ellipses="true"
+             is_toggle="true"
+             image_overlay="inventory_18"
+             layout="topleft"
+             left="0"
+             tool_tip="Shows/hides Inventory"
+             top="5"
+             name="inventory_btn"
+             width="36">
+                <button.init_callback
+                 function="Button.SetDockableFloaterToggle"
+                 parameter="inventory" />
+            </button>
+        </layout_panel>
+        -->
+        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbinv"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="inventory_18"
+             layout="topleft"
+             left="0"
+             name="sidebar_inv_btn"
+             tool_tip="Shows/hides inventory"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+
     <icon
      auto_resize="false"
      color="Transparent"
@@ -509,40 +575,6 @@ Disabled for now.
      top="0"
      width="3"/>
 
-    <layout_panel
-    mouse_opaque="false"
-    auto_resize="false"
-    follows="left|right"
-    height="28"
-    layout="topleft"
-    min_height="28"
-    min_width="40"
-    name="inventory_panel"
-    user_resize="false"
-    width="40">
-      <button
-           image_selected="PushButton_Selected_Press"
-           image_pressed="PushButton_Press"
-           image_pressed_selected="PushButton_Selected_Press"
-       follows="left|right"
-       height="23"
-       use_ellipses="true"
-       is_toggle="true"
-       image_overlay="inventory_18"
-       layout="topleft"
-       left="0"
-       tool_tip="Shows/hides Inventory"
-       top="5"
-       name="inventory_btn"
-       width="36">
-        <button.init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="inventory" />
-      </button>
-    </layout_panel>
-
-
-
     <layout_panel
      follows="left|right"
      height="30"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml b/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
index b96c1650ac..740ae41181 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
@@ -376,9 +376,6 @@
          name="build_btn_panel"
          user_resize="false"
          width="40">
-<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
-Disabled for now.
--->
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -492,19 +489,9 @@ Disabled for now.
                  parameter="mini_map" />
             </bottomtray_button>
         </layout_panel>
-        <icon
-         auto_resize="false"
-         color="Transparent"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="3"
-         name="after_inventory_button"
-         top="0"
-         width="3"/>
         
+
+        <!--
          <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -536,8 +523,50 @@ Disabled for now.
                  parameter="inventory" />
             </button>
         </layout_panel>
-
+        -->
         
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbinv"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="inventory_18"
+             layout="topleft"
+             left="0"
+             name="sidebar_inv_btn"
+             tool_tip="Shows/hides inventory"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+
+        <icon
+         auto_resize="false"
+         color="Transparent"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="3"
+         name="before_chicklets_spacer"
+         top="0"
+         width="3"/>        
         
         <layout_panel
          follows="left|right"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml b/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
index 4a7b3b343e..c30750bca0 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
@@ -34,7 +34,7 @@
     		 left="12"
 		     name="ItemcountText"
 		     font="SansSerifMedium"
-		     text_color="EmphasisColor"
+		     text_color="SchemeLightest"
 		     top_pad="0"
 		     width="300">
     Items:
@@ -118,25 +118,25 @@
 	 show_item_link_overlays="true"
      width="290" />
   </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
+  <panel
    follows="left|right|bottom"
+   auto_resize="true"
    height="25"
    layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
+   top_pad="-3"
+   left="9"
    name="bottom_panel"
-   width="307">
-      <layout_panel
+   width="315">
+      <panel
        auto_resize="false"
+       follows="top|left"
        height="25"
+       left="0"
        layout="topleft"
        name="options_gear_btn_panel"
        width="32">
           <menu_button
-           follows="bottom|left"
+           follows="top|left"
            tool_tip="Show additional options"
            height="25"
            image_hover_unselected="Toolbar_Left_Over"
@@ -148,15 +148,17 @@
            name="options_gear_btn"
            top="0"
            width="31" />
-      </layout_panel>
-      <layout_panel
+      </panel>
+      <panel
+       follows="top|left"
        auto_resize="false"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="add_btn_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="AddItem_Off"
@@ -168,31 +170,61 @@
            tool_tip="Add new item"
            top="0"
            width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
+      </panel>
+      <panel
+       follows="top|left"
+       auto_resize="false"
        height="25"
        layout="topleft"
+       left_pad="0"
+       name="new_inventory_panel"
+       width="32">
+          <button
+           follows="top|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="inventory_18"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="new_inv_btn"
+           tool_tip="Additional Inventory Window"
+           top="0"
+           width="31">
+           <button.init_callback
+                 function="Button.SetDockableFloaterToggle"
+                 parameter="inventory" />
+           </button>
+      </panel>
+      <panel
+       follows="top|left|right"
+       auto_resize="true"
+       height="25"
+       left_pad="0"
+       layout="topleft"
        name="dummy_panel"
-       width="212">
+       width="183">
           <icon
-           follows="bottom|left|right"
+           follows="top|left|right"
            height="25"
            image_name="Toolbar_Middle_Off"
            layout="topleft"
            left="0"
            top="0"
            name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
+           width="182" />
+      </panel>
+      <panel
        auto_resize="false"
+       follows="top|right"
        height="25"
+       left_pad="0"
        layout="topleft"
        name="trash_btn_panel"
-       width="31">
+       width="32">
           <dnd_button
-           follows="bottom|left"
+           follows="top|right"
            height="25"
            image_hover_unselected="Toolbar_Right_Over"
            image_overlay="TrashItem_Off"
@@ -204,6 +236,6 @@
            tool_tip="Remove selected item"
            top="0"
            width="31"/>
-      </layout_panel>
-  </layout_stack>
+      </panel>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml b/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
index f3c6895cee..29d73c0a65 100644
--- a/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
@@ -102,11 +102,11 @@
                      user_resize="false" 
                      auto_resize="true"
                      width="102">
-                    <button
+                     <button
                          enabled="true"
                          follows="bottom|left|right"
                          height="23"
-                         label="Shop"
+                         label="Marketplace"
                          layout="topleft"
                          left="0"
                          name="shop_btn"

From 500e3a7a29245c2c627d6549a2f7a4e9e6b2f06e Mon Sep 17 00:00:00 2001
From: kadah <none@none>
Date: Mon, 24 Jan 2011 11:22:00 -0800
Subject: [PATCH 07/15] Fixed FIRE-326: VC80 compile link error in
 PROJECT_llupdaterservice_TEST_llupdaterservice

---
 indra/viewer_components/updater/tests/llupdaterservice_test.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 04ed4e6364..1346a3d7e5 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -85,6 +85,7 @@ void LLDir::setChatLogsDir(const std::string &path){}
 void LLDir::setPerAccountChatLogsDir(const std::string &username){}
 void LLDir::setLindenUserDir(const std::string &username){}		
 void LLDir::setSkinFolder(const std::string &skin_folder){}
+void LLDir::setSkinThemeFolder(const std::string& theme_folder){}
 bool LLDir::setCacheDir(const std::string &path){ return true; }
 void LLDir::dumpCurrentDirectories() {}
 

From fbba33000f41cb6693626397ac8590c5df45caa8 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 24 Jan 2011 13:23:11 -0800
Subject: [PATCH 08/15] Disabling avatar_lad.xml debugging log that was turned
 on (and I'm guessing was forgotten about and never turned off)
 (lgpl/wtfpl/public domain)

---
 indra/newview/llvoavatar.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c41687233f..a8c6dce3b4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5237,6 +5237,7 @@ BOOL LLVOAvatar::loadAvatar()
 	}
 
 	// Uncomment to enable avatar_lad.xml debugging. 
+#if 0
 	std::ofstream file;
 	file.open("avatar_lad.log");
 	for( LLViewerVisualParam* param = (LLViewerVisualParam*) getFirstVisualParam(); 
@@ -5248,6 +5249,7 @@ BOOL LLVOAvatar::loadAvatar()
 	}
 
 	file.close();
+#endif
 	
 	return TRUE;
 }

From 753248e93eaa159263ef2684d4f66d38e3154d4e Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 24 Jan 2011 13:42:37 -0800
Subject: [PATCH 09/15] Fixing logging of messages before per account log
 directorys are known (i.e. before the login button is clicked) (lgpl)

---
 indra/newview/lllogchat.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 9adf374c71..50de843f15 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -53,6 +53,7 @@
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
+#include "llstartup.h"
 
 const S32 LOG_RECALL_SIZE = 2048;
 
@@ -272,6 +273,10 @@ void LLLogChat::saveHistory(const std::string& filename,
 			    const LLUUID& from_id,
 			    const std::string& line)
 {
+	if(LLStartUp::getStartupState() != STATE_LOGIN_CLEANUP)
+	{
+		return;
+	}
 	std::string tmp_filename = filename;
 	LLStringUtil::trim(tmp_filename);
 	if (tmp_filename.empty())

From 5ed9896e18aa5d4eabc3761d1b2d18af8d0080e3 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 24 Jan 2011 13:49:16 -0800
Subject: [PATCH 10/15] Featuretable update.

---
 FIRESTORM-FEATURETABLE.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index 049e4a186b..7341408774 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -43,4 +43,5 @@ Hippos!			LGPL
 V1_MouseCursors		LGPL/Creative Commons Attribution-Share Alike 3.0
 V1_Icons			Creative Commons Attribution-Share Alike 3.0
 AFK_ExtraControls	LGPL
-IgnoreFinishAnimation	BSD/PD
\ No newline at end of file
+IgnoreFinishAnimation	BSD/PD
+Progress_screens	LGPL

From d7a749f35468f038fe40045d5af71800874e8cc0 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 24 Jan 2011 17:41:11 -0800
Subject: [PATCH 11/15] Adding prefrence options for disabling of progress
 screens.

---
 .../skins/default/xui/en/panel_preferences_firestorm.xml      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 65b939c92f..95adb111b7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -89,6 +89,10 @@
        value="1"
        width="150" />
     </radio_group>
+
+    <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Teleport Screens" left_delta="-20" mouse_opaque="true" name="tp_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableTeleportScreens" tool_tip="Disables the black teleport screen during all teleports."/>
+    <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Login Progress Screen" left_delta="0" mouse_opaque="true" name="login_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableLoginScreens" tool_tip="Disables the black login progress Screen"/>
+    <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable Logout Progress Screen" left_delta="0" mouse_opaque="true" name="logout_screen_toggle" radio_style="false" width="270" control_name="PhoenixDisableLogoutScreens" tool_tip="Disables the black Logout progress screen."/>
   
     
 </panel>

From d407ead0e8177fc2b47c165d5a6be4c6f15bc06a Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 24 Jan 2011 18:08:45 -0800
Subject: [PATCH 12/15] Fixing the progress screens to be on by default.

---
 indra/newview/app_settings/settings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e1d9184dcb..3dea67694e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13005,7 +13005,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</map>
 		<key>PhoenixDisableLogoutScreens</key>
 		<map>
@@ -13016,7 +13016,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</map>
 		<key>PhoenixDisableTeleportScreens</key>
 		<map>
@@ -13027,7 +13027,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</map>
 </map>
 </llsd>

From becbca6ca7e279e500a25a97131be1776a8178a2 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Mon, 24 Jan 2011 20:49:00 -0600
Subject: [PATCH 13/15] Fix hang when saving textures to local disk. From
 SH-761, fixes FIRE-352.

---
 indra/newview/llpreviewtexture.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 283348a8f1..8b53b3f13f 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -273,6 +273,8 @@ void LLPreviewTexture::saveAs()
 	mSaveFileName = file_picker.getFirstFile();
 	mLoadingFullImage = TRUE;
 	getWindow()->incBusyCount();
+
+	mImage->forceToSaveRawImage(0) ;//re-fetch the raw image if the old one is removed.
 	mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
 								0, TRUE, FALSE, new LLUUID( mItemUUID ), &mCallbackTextureList );
 }

From ec28ac8b839228e04d1a66470b2be7badd4e87e3 Mon Sep 17 00:00:00 2001
From: kadah <none@none>
Date: Mon, 24 Jan 2011 22:10:23 -0800
Subject: [PATCH 14/15] Changed profiles to use group_list instead Modified
 group_list ctrl to support any list of group (HACK) Fixed (some) profile
 layout issues

---
 indra/newview/llgrouplist.cpp                 | 41 +++++++++-
 indra/newview/llgrouplist.h                   | 10 +++
 indra/newview/llpanelavatar.cpp               | 36 ++++----
 indra/newview/llpanelavatar.h                 |  2 +
 .../skins/default/xui/en/panel_my_profile.xml | 82 +++++++++++--------
 .../skins/default/xui/en/panel_profile.xml    | 24 ++++--
 6 files changed, 130 insertions(+), 65 deletions(-)

diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index c3e6e1c2dc..8ebb15d48a 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -65,20 +65,28 @@ public:
 
 static const LLGroupComparator GROUP_COMPARATOR;
 
+LLGroupList::Params::Params()
+: for_agent("for_agent", true)
+{
+}
 
 LLGroupList::LLGroupList(const Params& p)
-:	LLFlatListViewEx(p)
+:	LLFlatListViewEx(p),
+	mForAgent(p.for_agent)
 	, mDirty(true) // to force initial update
 {
 	// Listen for agent group changes.
-	gAgent.addListener(this, "new group");
+	if (mForAgent) gAgent.addListener(this, "new group");
 
-	mShowIcons = gSavedSettings.getBOOL("GroupListShowIcons");
+	mShowIcons = mForAgent && gSavedSettings.getBOOL("GroupListShowIcons");
 	setCommitOnSelectionChange(true);
 
 	// Set default sort order.
 	setComparator(&GROUP_COMPARATOR);
 
+
+	if (mForAgent)
+	{
 	// Set up context menu.
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
@@ -90,11 +98,12 @@ LLGroupList::LLGroupList(const Params& p)
 			gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	if(context_menu)
 		mContextMenuHandle = context_menu->getHandle();
+	}
 }
 
 LLGroupList::~LLGroupList()
 {
-	gAgent.removeListener(this);
+	if (mForAgent) gAgent.removeListener(this);
 	LLView::deleteViewByHandle(mContextMenuHandle);
 }
 
@@ -112,6 +121,8 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
 
+	if (mForAgent)
+	{
 	LLMenuGL* context_menu = (LLMenuGL*)mContextMenuHandle.get();
 	if (context_menu && size() > 0)
 	{
@@ -119,6 +130,7 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask)
 		context_menu->updateParent(LLMenuGL::sMenuContainer);
 		LLMenuGL::showPopup(this, context_menu, x, y);
 	}
+	}
 
 	return handled;
 }
@@ -146,6 +158,8 @@ static bool findInsensitive(std::string haystack, const std::string& needle_uppe
 
 void LLGroupList::refresh()
 {
+	if (mForAgent)
+	{
 	const LLUUID& 		highlight_id	= gAgent.getGroupID();
 	S32					count			= gAgent.mGroups.count();
 	LLUUID				id;
@@ -174,6 +188,19 @@ void LLGroupList::refresh()
 	}
 
 	selectItemByUUID(highlight_id);
+	}
+	else
+	{
+		clear();
+
+		for (group_map_t::iterator it = mGroups.begin(); it != mGroups.end(); ++it)
+		{
+			addNewItem(it->second, it->first, LLUUID::null, ADD_BOTTOM);
+		}
+
+		// Sort the list.
+		sort();
+	}
 
 	setDirty(false);
 	onCommit();
@@ -194,6 +221,12 @@ void LLGroupList::toggleIcons()
 	}
 }
 
+void LLGroupList::setGroups(const std::map< std::string,LLUUID> group_list)
+{
+	mGroups = group_list;
+	setDirty(true);
+}
+
 //////////////////////////////////////////////////////////////////////////
 // PRIVATE Section
 //////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index d7051db891..8da6210862 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -45,6 +45,11 @@ class LLGroupList: public LLFlatListViewEx, public LLOldEvents::LLSimpleListener
 {
 	LOG_CLASS(LLGroupList);
 public:
+	struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
+	{
+		Optional<bool>	for_agent;
+		Params();
+	};
 
 	LLGroupList(const Params& p);
 	virtual ~LLGroupList();
@@ -55,6 +60,7 @@ public:
 	void setNameFilter(const std::string& filter);
 	void toggleIcons();
 	bool getIconsVisible() const { return mShowIcons; }
+	void setGroups(const std::map< std::string,LLUUID> group_list);
 
 private:
 	void setDirty(bool val = true)		{ mDirty = val; }
@@ -70,6 +76,10 @@ private:
 	bool mShowIcons;
 	bool mDirty;
 	std::string mNameFilter;
+
+	bool mForAgent;
+	typedef std::map< std::string,LLUUID>	group_map_t;
+	group_map_t 			mGroups;
 };
 
 class LLButton;
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index b7638059fe..a62c058d1c 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -46,6 +46,8 @@
 #include "llvoiceclient.h"
 #include "lltextbox.h"
 #include "lltrans.h"
+#include "llgroupactions.h"
+#include "llgrouplist.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLDropTarget
@@ -506,6 +508,10 @@ BOOL LLPanelAvatarProfile::postBuild()
 	enable.add("Profile.EnableBlock", boost::bind(&LLPanelAvatarProfile::enableBlock, this));
 	enable.add("Profile.EnableUnblock", boost::bind(&LLPanelAvatarProfile::enableUnblock, this));
 
+	LLGroupList* group_list = getChild<LLGroupList>("group_list");
+	group_list->setDoubleClickCallback(boost::bind(&LLPanelAvatarProfile::openGroupProfile, this));
+	group_list->setReturnCallback(boost::bind(&LLPanelAvatarProfile::openGroupProfile, this));
+
 	mProfileMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_profile_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
@@ -542,7 +548,6 @@ void LLPanelAvatarProfile::resetControls()
 	getChildView("status_panel")->setVisible( true);
 	getChildView("profile_buttons_panel")->setVisible( true);
 	getChildView("title_groups_text")->setVisible( true);
-	getChildView("sl_groups")->setVisible( true);
 	getChildView("add_friend")->setEnabled(true);
 
 	getChildView("status_me_panel")->setVisible( false);
@@ -559,7 +564,6 @@ void LLPanelAvatarProfile::resetData()
 	getChild<LLUICtrl>("status_message")->setValue(LLStringUtil::null);
 	getChild<LLUICtrl>("sl_description_edit")->setValue(LLStringUtil::null);
 	getChild<LLUICtrl>("fl_description_edit")->setValue(LLStringUtil::null);
-	getChild<LLUICtrl>("sl_groups")->setValue(LLStringUtil::null);
 	getChild<LLUICtrl>("homepage_edit")->setValue(LLStringUtil::null);
 	getChild<LLUICtrl>("register_date")->setValue(LLStringUtil::null);
 	getChild<LLUICtrl>("acc_status_text")->setValue(LLStringUtil::null);
@@ -597,6 +601,12 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d
 
 void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_groups)
 {
+	//KC: the group_list ctrl can handle all this for us on our own profile
+	if (getAvatarId() == gAgent.getID())
+		return;
+
+	LLGroupList* group_list = getChild<LLGroupList>("group_list");
+
 	// *NOTE dzaporozhan
 	// Group properties may arrive in two callbacks, we need to save them across
 	// different calls. We can't do that in textbox as textbox may change the text.
@@ -610,22 +620,13 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g
 		mGroups[group_data.group_name] = group_data.group_id;
 	}
 
-	// Creating string, containing group list
-	std::string groups = "";
-	for (group_map_t::iterator it = mGroups.begin(); it != mGroups.end(); ++it)
-	{
-		if (it != mGroups.begin())
-			groups += ", ";
+	group_list->setGroups(mGroups);
+}
 
-		std::string group_name = LLURI::escape(it->first);
-		std::string group_url= it->second.notNull()
-				? "[secondlife:///app/group/" + it->second.asString() + "/about " + group_name + "]"
-						: getString("no_group_text");
-
-		groups += group_url;
-	}
-
-	getChild<LLUICtrl>("sl_groups")->setValue(groups);
+void LLPanelAvatarProfile::openGroupProfile()
+{
+	LLUUID group_id = getChild<LLGroupList>("group_list")->getSelectedUUID();
+	LLGroupActions::show(group_id);
 }
 
 void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
@@ -863,7 +864,6 @@ void LLPanelMyProfile::resetControls()
 	getChildView("status_panel")->setVisible( false);
 	getChildView("profile_buttons_panel")->setVisible( false);
 	getChildView("title_groups_text")->setVisible( false);
-	getChildView("sl_groups")->setVisible( false);
 	getChildView("status_me_panel")->setVisible( true);
 	getChildView("profile_me_buttons_panel")->setVisible( true);
 }
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 11c7716322..4cebf2aafb 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -214,6 +214,8 @@ private:
 	typedef std::map< std::string,LLUUID>	group_map_t;
 	group_map_t 			mGroups;
 
+	void					openGroupProfile();
+
 	LLToggleableMenu*		mProfileMenu;
 };
 
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 2a5330083e..fe1988570c 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="532"
+ height="552"
  label="Profile"
  layout="topleft"
  left="0"
@@ -42,14 +42,14 @@
     follows="all"
     layout="topleft"
     name="profile_accordion"
-    height="505"
+    height="500"
     width="313">
      <accordion_tab
       expanded="true"
       layout="topleft"
       name="second_life_tab"
       title="Avatar"
-      fit_panel="false">
+      fit_panel="true">
         <scroll_container
          color="SL-Background_66"
          follows="all"
@@ -58,16 +58,16 @@
          name="profile_sl_scroll"
          opaque="true"
          height="650"
-         width="313"
+         width="331"
          top="0">
           <panel
-            layout="topleft"
-            follows="left|top|right"
-            height="650"
-            name="scroll_content_sl_panel"
-            top="0"
-            left="0"
-            width="313">
+           layout="topleft"
+           follows="left|top|right"
+           height="800"
+           name="second_life_panel"
+           top="0"
+           left="0"
+           width="313">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -79,19 +79,20 @@
                left="10"
                name="2nd_life_pic"
                top="0"
-               width="275" />           
-             <text
+               width="275" />
+            <text
              follows="left|top"
              font.style="BOLD"
              height="13"
              layout="topleft"
              left="4"
              name="About_sl_text"
-             text_color="white"
+             text_color="White"
              top_pad="0"
              value="About:"
-             width="100" />
-              <expandable_text
+             width="280" />
+            <expandable_text
+               allow_scroll="true"
                follows="left|top|right"
                height="240"
                layout="topleft"
@@ -99,8 +100,7 @@
                textbox.max_length="512"
                textbox.show_context_menu="true"
                name="sl_description_edit"
-               top_pad="0"
-               allow_scroll="true"
+               top_pad="3"
                translate="false"
                width="280"
                expanded_bg_visible="true"
@@ -116,7 +116,7 @@
              left_pad="0"
              top_pad="0"
              name="title_member_text"
-             text_color="white"
+             text_color="White"
              top_delta="0"
              value="Resident Since:"
              width="280" />
@@ -144,7 +144,7 @@
              top_pad="12"
              value="Account Status:"
              width="280"
-             word_wrap="true" /> 
+             word_wrap="true" />
             <text_editor
              allow_scroll="false"
              bg_visible="false"
@@ -169,7 +169,7 @@
              height="15"
              layout="topleft"
              name="title_partner_text"
-             text_color="white"
+             text_color="White"
              top_pad="0"
              value="Partner:"
              width="280" />
@@ -189,26 +189,33 @@
                link="true"
                name="partner_text"
                top="0"
-               use_ellipses="true" 
-               width="300" />
+               use_ellipses="true"
+		       width="300" />
             </panel>
-
-            <!--
             <text
              follows="left|top"
              font.style="BOLD"
              height="13"
              layout="topleft"
              left="4"
-             name="title_my_groups_text"
-             text_color="white"
-             top_pad="3"
+             name="title_groups_text"
+             text_color="White"
+             top_pad="0"
              value="Groups:"
-             width="290" />
-            -->
+             width="280" />
+			<group_list
+			 for_agent="true"
+			 allow_select="true"
+             height="162"
+             follows="all"
+			 left="5"
+			 name="group_list"
+             top_pad="0"
+			 width="280" />
+<!--
             <expandable_text
             follows="all"
-            height="150"
+            height="160"
             layout="topleft"
             left="5"
             name="sl_groups"
@@ -218,12 +225,15 @@
             translate="false"
             width="280"
             expanded_bg_visible="true"
+            word_wrap="true"
+            allow_scroll="false"
             expanded_bg_color="SL-Background_Light">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-            </expandable_text>     
-          </panel>        
+            </expandable_text>
+-->
+          </panel>
         </scroll_container>
-      </accordion_tab>
+    </accordion_tab>
     <accordion_tab
      expanded="false"
      layout="topleft"
@@ -283,7 +293,7 @@
              layout="topleft"
              left="4"
              name="homepage_text"
-             text_color="white"
+             text_color="White"
              top_pad="3"
              value="Web page:"
              width="280" />
@@ -299,7 +309,7 @@
               width="280"
               word_wrap="false"
               use_ellipses="true" />
-            </panel>
+          </panel>
         </scroll_container>
       </accordion_tab>
     </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 530f2cd0ed..112bac2637 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -63,7 +63,7 @@
           <panel
            layout="topleft"
            follows="left|top|right"
-           height="750"
+           height="800"
            name="second_life_panel"
            top="0"
            left="0"
@@ -106,7 +106,7 @@
                expanded_bg_visible="true"
                expanded_bg_color="SL-Background_Light">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>              
+              </expandable_text>
             <text
              left="4"
              follows="left|top"
@@ -135,13 +135,12 @@
              width="280"
              word_wrap="true" />
             <text
-             left="4"
              follows="left|top"
              font.style="BOLD"
              height="15"
              layout="topleft"
              name="title_acc_status_text"
-             text_color="White"
+             text_color="white"
              top_pad="12"
              value="Account Status:"
              width="280"
@@ -191,7 +190,7 @@
                name="partner_text"
                top="0"
                use_ellipses="true"
-           width="300" />
+		       width="300" />
             </panel>
             <text
              follows="left|top"
@@ -204,6 +203,16 @@
              top_pad="0"
              value="Groups:"
              width="280" />
+			<group_list
+			 for_agent="false"
+			 allow_select="true"
+             height="162"
+             follows="all"
+			 left="5"
+			 name="group_list"
+             top_pad="0"
+			 width="280" />
+<!--
             <expandable_text
             follows="all"
             height="160"
@@ -220,7 +229,8 @@
             allow_scroll="false"
             expanded_bg_color="SL-Background_Light">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-            </expandable_text>               
+            </expandable_text>
+-->
           </panel>
         </scroll_container>
     </accordion_tab>
@@ -258,7 +268,7 @@
                layout="topleft"
                left="10"
                name="real_world_pic"
-               top="00"
+               top="0"
                width="275" />
               <expandable_text
                follows="left|top|right"

From 696539ae30bc97f0b5a1c3171ea3bc3d0b3ae728 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Tue, 25 Jan 2011 03:34:55 -0600
Subject: [PATCH 15/15] Arrehn's theme setting fix, backported.

---
 indra/newview/llfloaterpreference.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a5cd803866..0bb7f3a42f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1766,6 +1766,7 @@ void LLPanelPreferenceSkins::onSkinChanged()
 	m_Skin = (m_pSkinCombo) ? m_pSkinCombo->getSelectedValue().asString() : "default";
 	m_SkinTheme = "default";
 	refreshSkinThemeList();
+	onSkinThemeChanged(); // make sure we initialize a theme for our new skin
 }
 
 void LLPanelPreferenceSkins::onSkinThemeChanged()