From d6d8681874c934303f446017f60123a3a021d421 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 13 Oct 2011 17:17:57 -0500
Subject: [PATCH 01/23] onVisibilityChange renamed to handleVisibilityChange

---
 indra/llui/llmenugl.cpp             | 4 ++--
 indra/llui/llmenugl.h               | 2 +-
 indra/llui/llview.cpp               | 6 +++---
 indra/llui/llview.h                 | 4 ++--
 indra/newview/llfloaterchat.cpp     | 4 ++--
 indra/newview/llfloaterchat.h       | 2 +-
 indra/newview/llimpanel.cpp         | 2 +-
 indra/newview/llimpanel.h           | 2 +-
 indra/newview/llmediactrl.cpp       | 4 ++--
 indra/newview/llmediactrl.h         | 2 +-
 indra/newview/llpaneldirbrowser.cpp | 4 ++--
 indra/newview/llpaneldirbrowser.h   | 2 +-
 indra/newview/llpaneldirfind.cpp    | 4 ++--
 indra/newview/llpaneldirfind.h      | 2 +-
 14 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cf9af9b32..1e257d4fa 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1279,13 +1279,13 @@ void LLMenuItemBranchGL::updateBranchParent(LLView* parentp)
 	}
 }
 
-void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )
+void LLMenuItemBranchGL::handleVisibilityChange( BOOL new_visibility )
 {
 	if (new_visibility == FALSE && getBranch() && !getBranch()->getTornOff())
 	{
 		getBranch()->setVisible(FALSE);
 	}
-	LLMenuItemGL::onVisibilityChange(new_visibility);
+	LLMenuItemGL::handleVisibilityChange(new_visibility);
 }
 
 BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 63f9d555d..2150d5584 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -613,7 +613,7 @@ public:
 	virtual void updateBranchParent( LLView* parentp );
 
 	// LLView Functionality
-	virtual void onVisibilityChange( BOOL curVisibilityIn );
+	virtual void handleVisibilityChange( BOOL curVisibilityIn );
 
 	virtual void draw();
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 339e3b97c..6524f1856 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -644,14 +644,14 @@ void LLView::setVisible(BOOL visible)
 		if (!getParent() || getParent()->isInVisibleChain())
 		{
 			// tell all children of this view that the visibility may have changed
-			onVisibilityChange( visible );
+			handleVisibilityChange( visible );
 		}
 		updateBoundingRect();
 	}
 }
 
 // virtual
-void LLView::onVisibilityChange ( BOOL new_visibility )
+void LLView::handleVisibilityChange ( BOOL new_visibility )
 {
 	for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
 	{
@@ -659,7 +659,7 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
 		// only views that are themselves visible will have their overall visibility affected by their ancestors
 		if (viewp->getVisible())
 		{
-			viewp->onVisibilityChange ( new_visibility );
+			viewp->handleVisibilityChange ( new_visibility );
 		}
 	}
 }
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 43ee36a4f..fa53862d1 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -94,7 +94,7 @@ virtual void	setEnabled(BOOL enabled)	{ mEnabled = enabled; }
 		LLCheckBoxCtrl, LLComboBox, LLLineEditor, LLMenuGL, LLRadioGroup, etc
 virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text ) { return FALSE; }
 		LLUICtrl, LLButton, LLCheckBoxCtrl, LLLineEditor, LLMenuGL, LLSliderCtrl
-virtual void	onVisibilityChange ( BOOL curVisibilityIn );
+virtual void	handleVisibilityChange ( BOOL curVisibilityIn );
 		LLMenuGL
 virtual LLRect getSnapRect() const	{ return mRect; } *TODO: Make non virtual
 		LLFloater
@@ -342,7 +342,7 @@ public:
 
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
-	virtual void	onVisibilityChange ( BOOL curVisibilityIn );
+	virtual void	handleVisibilityChange ( BOOL curVisibilityIn );
 
 	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }
 	void			popVisible()				{ setVisible(mLastVisible); mLastVisible = TRUE; }
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index bfc046b7a..af37749c9 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -169,7 +169,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 	setVisible(FALSE);
 }
 
-void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
+void LLFloaterChat::handleVisibilityChange(BOOL new_visibility)
 {
 	// Hide the chat overlay when our history is visible.
 	updateConsoleVisibility();
@@ -180,7 +180,7 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 		LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE);
 	}
 
-	LLFloater::onVisibilityChange(new_visibility);
+	LLFloater::handleVisibilityChange(new_visibility);
 }
 
 void LLFloaterChat::setMinimized(BOOL minimized)
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index 775f21be6..4f9a03be5 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -62,7 +62,7 @@ public:
 	virtual void draw();
 	virtual BOOL postBuild();
 	virtual void onClose(bool app_quitting);
-	virtual void onVisibilityChange(BOOL cur_visibility);
+	virtual void handleVisibilityChange(BOOL cur_visibility);
 	virtual void setMinimized(BOOL);
 	void updateConsoleVisibility();
 	void updateSettings();
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index ff574bea8..1278de487 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2050,7 +2050,7 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
 	destroy();
 }
 
-void LLFloaterIMPanel::onVisibilityChange(BOOL new_visibility)
+void LLFloaterIMPanel::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 5787fc603..6f4e7d43a 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -204,7 +204,7 @@ public:
 	// Check typing timeout timer.
 	/*virtual*/ void draw();
 	/*virtual*/ void onClose(bool app_quitting = FALSE);
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
+	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
 
 	// add target ids to the session. 
 	// Return TRUE if successful, otherwise FALSE.
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 8124e841d..186dd2f27 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -407,7 +407,7 @@ BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
+void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
 {
 	// set state of frequent updates automatically if visibility changes
 	if ( new_visibility )
@@ -418,7 +418,7 @@ void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
 	{
 		mFrequentUpdates = false;
 	}
-	LLUICtrl::onVisibilityChange(new_visibility);
+	LLUICtrl::handleVisibilityChange(new_visibility);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index bd5fa03ac..de0018988 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -133,7 +133,7 @@ class LLMediaCtrl :
 		virtual BOOL handleUnicodeCharHere(llwchar uni_char);
 		virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
 		virtual void draw();
-		virtual void onVisibilityChange ( BOOL curVisibilityIn );
+		virtual void handleVisibilityChange ( BOOL curVisibilityIn );
 
 		// focus overrides
 		void onFocusLost();
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 35f207ab2..a306d4730 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -1286,13 +1286,13 @@ void LLPanelDirBrowser::onKeystrokeName(LLLineEditor* line, void* data)
 }
 
 // setup results when shown
-void LLPanelDirBrowser::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirBrowser::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
 		onCommitList(NULL, this);
 	}
-	LLPanel::onVisibilityChange(new_visibility);
+	LLPanel::handleVisibilityChange(new_visibility);
 }
 
 S32 LLPanelDirBrowser::showNextButton(S32 rows)
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index e27b5524c..6fa6d7c47 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -57,7 +57,7 @@ public:
 	// Use to get periodic updates.
 	virtual void draw();
 
-	virtual void onVisibilityChange(BOOL curVisibilityIn);
+	virtual void handleVisibilityChange(BOOL curVisibilityIn);
 
 	// Redo your search for the prev/next page of results
 	virtual void prevPage();
diff --git a/indra/newview/llpaneldirfind.cpp b/indra/newview/llpaneldirfind.cpp
index f960fbb69..94edad4dd 100644
--- a/indra/newview/llpaneldirfind.cpp
+++ b/indra/newview/llpaneldirfind.cpp
@@ -194,13 +194,13 @@ void LLPanelDirFind::draw()
 // When we show any browser-based view, we want to hide all
 // the right-side XUI detail panels.
 // virtual
-void LLPanelDirFind::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirFind::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
 		mFloaterDirectory->hideAllDetailPanels();
 	}
-	LLPanel::onVisibilityChange(new_visibility);
+	LLPanel::handleVisibilityChange(new_visibility);
 }
 
 // virtual
diff --git a/indra/newview/llpaneldirfind.h b/indra/newview/llpaneldirfind.h
index 99c9daaf1..670f30c7e 100644
--- a/indra/newview/llpaneldirfind.h
+++ b/indra/newview/llpaneldirfind.h
@@ -53,7 +53,7 @@ public:
 
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
+	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
 
 	// Pure virtual.  Must be implemented
 	virtual void search(const std::string& search_text) = 0;

From 3ac01ee6c47698f6d139cf3d447f56cdd5f89439 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Fri, 14 Oct 2011 09:17:34 +0200
Subject: [PATCH 02/23] Behold, automatic prebuilt muncher!

---
 repackage.sh | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100755 repackage.sh

diff --git a/repackage.sh b/repackage.sh
new file mode 100755
index 000000000..5de6ea4c7
--- /dev/null
+++ b/repackage.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+#(C) 2011 SIANA GEARZ
+
+usage() {
+	echo "Usage: repackage PLATTFORM FILEIN.tar.bz2 [FILEOUT.tar.bz2]
+Repackage an archive from llautobuild format into legacy format
+
+PLATTFORM can be one of windows, linux, mac.
+"
+	exit 0
+}
+
+TMP="/tmp/pak$$"
+LIBPATH=""
+INCPATH=""
+PWD=`pwd`
+
+shopt -s nocasematch
+case "$1" in
+	--windows|-w|windows|win)
+		MODE=win
+		LIBPATH="libraries/i686-win32/lib/release"
+		LIBDPATH="libraries/i686-win32/lib/debug"
+		INCPATH="libraries/i686-win32/include"
+		;;
+	--mac|--osx|--darwin|-x|mac|osx|darwin)
+		MODE=osx
+		LIBPATH="libraries/universal-darwin/lib_release"
+		LIBDPATH="libraries/universal-darwin/lib_release"
+		INCPATH="libraries/universal-darwin/include"
+		;;
+	--lin|--linux|-l|linux)
+		MODE=linux
+		LIBPATH="libraries/i686-linux/lib_release_client"
+		INCPATH="libraries/i686-linux/include"
+		;;
+	--linux64|-6|linux64)
+		MODE=linux64
+		LIBPATH="libraries/x86_64-linux/lib_release_client"
+		INCPATH="libraries/x86_64-linux/include"
+		;;
+	*)
+		usage
+		;;
+esac
+
+case "$2" in
+	--commoninclude|--common-include|--common)
+		INCPATH="libraries/include"
+		shift
+		;;
+esac
+
+test -n "$2" && FILEIN=`readlink -e $2`
+test -n "$3" && FILEOUT=`readlink -f $3`
+
+if [ -z $FILEIN ]; then
+	usage
+fi
+
+if [ -z $FILEOUT ]; then
+	FILEOUT=`readlink -m package.tar.bz2`
+fi
+
+mkdir "$TMP"
+cd "$TMP"
+
+case "$FILEIN" in
+	http\:\/\/|https\:\/\/)
+		echo "	Downloading..."
+		wget "$FILEIN" -O package.tar.bz2
+		echo "	Unpacking..."
+		tar -xjvf package.tar.bz2
+		rm package.tar.bz2
+		;;
+	*)
+		echo "	Unpacking..."
+		tar -xjvf "$FILEIN"
+		;;
+esac
+
+if [ -n "$LIBDPATH" -a -d lib/debug ]; then
+	mkdir -p $LIBDPATH
+	mv -f lib/debug/* $LIBDPATH
+fi
+if [ -d lib/release ]; then
+	mkdir -p $LIBPATH
+	mv -f lib/release/* $LIBPATH
+fi
+if [ -d include ]; then
+	mkdir -p $INCPATH
+	mv -f include/* $LIBPATH
+fi
+
+echo "	Packing..."
+tar -cjvf "$FILEOUT" libraries LICENSES
+echo "	Checksum:"
+cd `dirname "$FILEOUT"`
+md5sum -b `basename "$FILEOUT"`
+cd "$PWD"
+rm -rf "$TMP"
+

From dd672ae5cb3ee25f4ec0ac82af68038a3560fa03 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 15 Oct 2011 00:46:41 +0200
Subject: [PATCH 03/23] Made collapse in inventory purrrrrrrdy!

---
 .../skins/default/textures/inv_collapse_all.tga  | Bin 0 -> 1068 bytes
 .../default/xui/en-us/floater_inventory.xml      |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/inv_collapse_all.tga

diff --git a/indra/newview/skins/default/textures/inv_collapse_all.tga b/indra/newview/skins/default/textures/inv_collapse_all.tga
new file mode 100644
index 0000000000000000000000000000000000000000..e27dc5ecded41e923c9ac22d7b31f7a9c40504c7
GIT binary patch
literal 1068
zcmd6lK?=e^3`K({@CYv5=q)M~L_w>#_f|4zn(NG}#QaPG(pqPVAWjLt1ARX~p+pPH
zXGwTgYrFo3gupZ`BCZN2TuO-}vsMsAsb9%M*n5nVHOk}}J(%3RZ;c`s`U#$AGu|^7
zRhrcB@Q2r<@3oiu3JWdqmM!lv=j324^b_ywP=D3m`{?|ZS>I)Donb2f%Y5!JQhf7<
i$3Etk?MFn9{||H3`LDD)U7BlqZjXn}ZP)IbEj<Az7vfm}

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 457ae4b3f..4c56c695b 100644
--- a/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -5,11 +5,11 @@
      title="Inventory" width="467">
 	<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
 	    left="6" mouse_opaque="true" name="inventory search editor" width="455" />
-  <button left="10" bottom_delta="-24" height="20" width="25" follows="left|top" halign="center"
-    label="--" name="collapse_btn" mouse_opaque="true" font="SansSerif"
+  <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"
+    label="" image_overlay="inv_collapse_all.tga" name="collapse_btn" mouse_opaque="true" font="SansSerif"
     tool_tip="Collapse All" />
-  <text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
-		height="16" left_delta="35" bottom_delta="0" width="120">Quick Filter:</text>
+  <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
+		height="16" left="30" bottom_delta="2" right="93">Quick Filter:</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">All Types</string>
 	<string name="filter_type_animation">Animations</string>
@@ -24,7 +24,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Snapshots</string>
 	<string name="filter_type_custom">Custom...</string>
-	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left_delta="60" width="150" bottom_delta="0">
+	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top|right" height="20" left="95" right="-6" bottom_delta="0">
 		<combo_item name="filter_type_all">All Types</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>

From 61777e9b8c2e9f141e6acfd5df5817d05ee3acdd Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 15 Oct 2011 02:13:16 +0200
Subject: [PATCH 04/23] Newer TCMalloc - fixes TeamViewer and hogging

---
 indra/newview/viewer_manifest.py | 2 +-
 install.xml                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7d811fb93..46f02976f 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -803,7 +803,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libalut.so")
             self.path("libopenal.so", "libopenal.so.1")
             self.path("libtcmalloc_minimal.so.0")
-            self.path("libtcmalloc_minimal.so.0.0.0")
+            self.path("libtcmalloc_minimal.so.0.2.2")
             self.end_prefix("lib")
 
 
diff --git a/install.xml b/install.xml
index d61fb7cea..616f2d3b3 100644
--- a/install.xml
+++ b/install.xml
@@ -544,16 +544,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>1d7acbc5b578b3b5cfc739d2f454b18c</string>
+            <string>b190d8a0dce8dd8b514d2adb2c74b8d8</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/google-linux-110103.tar.bz2</uri>
+			<uri>http://sldev.free.fr/libraries/google-perftools-1.8.3-linux-20110924.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>571a398f5b3f65ba2c02f48df843cc97</string>
+            <string>4f787437a5e063ccde6637dfb1ebc01d</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/tcmalloc-1.7-min-20110507.tar.bz2</uri>
+			<uri>https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2</uri>
           </map>
         </map>
       </map>

From ca757ff1b2df1412c5d377dc77961b3c6c928306 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 15 Oct 2011 03:10:31 +0200
Subject: [PATCH 05/23] Spit shine on browser, good as new! Thanks McCabe!

---
 indra/newview/llfloatermediabrowser.cpp       |  10 +-----
 indra/newview/llfloatermediabrowser.h         |   1 -
 .../skins/default/textures/go-home-4.png      | Bin 0 -> 485 bytes
 .../skins/default/textures/go-next-4.png      | Bin 0 -> 508 bytes
 .../skins/default/textures/go-previous-4.png  | Bin 0 -> 467 bytes
 .../skins/default/textures/textures.xml       |   5 +++
 .../skins/default/textures/view-refresh-5.png | Bin 0 -> 786 bytes
 .../xui/en-us/floater_media_browser.xml       |  32 ++++++++++--------
 8 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/go-home-4.png
 create mode 100644 indra/newview/skins/default/textures/go-next-4.png
 create mode 100644 indra/newview/skins/default/textures/go-previous-4.png
 create mode 100644 indra/newview/skins/default/textures/view-refresh-5.png

diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp
index d73cfde72..43abcb8c0 100644
--- a/indra/newview/llfloatermediabrowser.cpp
+++ b/indra/newview/llfloatermediabrowser.cpp
@@ -105,6 +105,7 @@ void LLFloaterMediaBrowser::draw()
 			media_playing = media_plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING;
 		}
 	}
+	childSetVisible("time_controls", show_time_controls);
 	childSetVisible("rewind", show_time_controls);
 	childSetVisible("play", show_time_controls && ! media_playing);
 	childSetVisible("pause", show_time_controls && media_playing);
@@ -139,7 +140,6 @@ BOOL LLFloaterMediaBrowser::postBuild()
 	childSetAction("pause", onClickPlay, this);
 	childSetAction("seek", onClickSeek, this);
 	childSetAction("go", onClickGo, this);
-	childSetAction("close", onClickClose, this);
 	childSetAction("open_browser", onClickOpenWebBrowser, this);
 	childSetAction("assign", onClickAssign, this);
 
@@ -284,14 +284,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data)
 	self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
 }
 
-//static 
-void LLFloaterMediaBrowser::onClickClose(void* user_data)
-{
-	LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-	self->close();
-}
-
 //static 
 void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
 {
diff --git a/indra/newview/llfloatermediabrowser.h b/indra/newview/llfloatermediabrowser.h
index afdd6e733..c2203670a 100644
--- a/indra/newview/llfloatermediabrowser.h
+++ b/indra/newview/llfloatermediabrowser.h
@@ -85,7 +85,6 @@ public:
 	static void onClickBack(void* user_data);
 	static void onClickForward(void* user_data);
 	static void onClickGo(void* user_data);
-	static void onClickClose(void* user_data);
 	static void onClickOpenWebBrowser(void* user_data);
 	static void onClickAssign(void* user_data);
 	static void onClickRewind(void* user_data);
diff --git a/indra/newview/skins/default/textures/go-home-4.png b/indra/newview/skins/default/textures/go-home-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..058c00af4f9a23c2207d353e166ad4fdf6d08870
GIT binary patch
literal 485
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLGcpTh?3y^(xT*426sPyUsnas<orB^kc`ya
z)Pq0OGJ#4YAxhFp$`gxH83GbB^GfvmTtgJfjP*?QEX=JNVu2PLdAc};Sorr&_RVT>
z5NK7Ot+R=Hr_;L$$xl>nK4FVfSkCcdzd$(SW)UGKuBIIVtcnY`k9M4!k>Rn_YngP*
z%Q7jstdIAuU%k5HHs`cO8se)~*)3XkVo~NT)5#i}SIu7bGv&6~f_ofIi5qmXmpoTH
zV9>*U{xe^Lw(sS9o;rmIc8S6b538@2PB(~VS@=MW!MFUzr+KW;E1ylUIscTw=DF^+
zUtin1=Ug@^l=YT*U~%qg7T=9;yz@S8UiUh_i1#o<?fvy8eUF(qnjSPr?=9lkoAA)q
zbCSH#mRxS%%X37Uf9%_T{LE>li=}^OvK?6#6DoSbWp={x)42<B>O{0IT<BUfq02^n
z{iLqg>lgQWyUHmp(DCkg9HI4zgE4ZNqeNTKM0bvkMI7fQ3KY!InZ4o5&Y#Y6vwyJj
Y?lpaEc<1SKU=TBSy85}Sb4q9e0OCZ#*8l(j

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/go-next-4.png b/indra/newview/skins/default/textures/go-next-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4362c1ed5b55644ae056f7fafc10c307f13f836
GIT binary patch
literal 508
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLGcpTh?3y^(xT*426sPyUsnas<orB^kc`ya
z)Pq0OGJ#4YAxhFp$`gxH83GbB^GfvmTtgJfjP*?QEX=JNVu2QWdb&7<SoqJKWSiX_
zAkyYMy+otrb<nO-E!o}MitD}q2mWu2Pj)xfcp>E6vBJ^AN;62r^qaGWr~iFrr6V^w
zMC0D=o%7l5`<!Cg-oBb91smD!@5dN^2)KTfeC?TE6wcJMbk!<V1^pZS?9LJaBCIo)
zofP1H{@IU%>Ak?#r5aqhX40oN_2``b#r8zhayq-fK26`?Q=j(;O8=B$Vbq=O-Sv2e
zSocw}2@*fes|DCpJe}q}pZI#$+(!{2t}?$FTeSD(EAVg}o{+X#(s%h~zlE%Mi&u4o
zSJ*A=<~r2ywaRzby2;Bj>$_GL$h50?CVhS!$GY$R<*cn%7i#R*H{6kW|N4{sE#n9C
zw&kAOwC6G7r?nZq)%p{PuYcuAX7RHQxwXx=E%8l)pWuGkFUB8p)FyMzzQ19=T*|uk
t->k(9pRXnq^In*}{1-ptv(0w*^|dFr{%g2)wh|cf44$rjF6*2UngBd$$eREF

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/go-previous-4.png b/indra/newview/skins/default/textures/go-previous-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a677ecd76f219fc5a52e4c9fb5a43c5c1ad73f
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+<eJAhpP00BcuL_t(IPo0uIYlBc2g+rHgD0J&mx^*fY
zyS8(GOaD>-fnQ@s9TarYAc{r=?W9Oi{7O@yB)K_P8k*ougB1?<;(gEa9)0g*a^m4Q
z?&VYs^Bl%Ap66e&evSsfG==$1mgNrnZWI89OPDRgFuJyF$tVDduVH?-EbF_fD$+C!
zktB&iSXvw;L(v_~x#KviJkLoG1SClkQrC44qU%m&Sso^X`4Q%Y@B5o9%gB5_C)hJZ
z&x)e>1;Bg-EfKr#NLMP;G?|*sW+YA1L4s#N5SE_j_1#rfJt|GpNF2w*pNkYv^fPSR
z?xRx(-A7S0P#A{n=>YNoNQ?Lznuh*JQ54sBzhdZc3cHb@@E(v-*Y&mQx_u|;oT2H_
z3x?ubKt2>jq20&b#JwapfFuBXjk?PF#Xlp~{tci;Kra3QYyn1Rh5jQMT?GID002ov
JPDHLkV1iC-z9|3z

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 3f93a7ef8..c7929b058 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -390,5 +390,10 @@
   <texture name="media_btn_stoploading.png"/>
   <texture name="media_panel_divider.png"/>
   <texture name="media_panel_scrollbg.png"/>
+  
+  <texture name="go-previous-4.png"/>
+  <texture name="go-next-4.png"/>
+  <texture name="view-refresh-5.png"/> 
+  <texture name="go-home-4.png"/>
 
 </textures>
diff --git a/indra/newview/skins/default/textures/view-refresh-5.png b/indra/newview/skins/default/textures/view-refresh-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb5d1b97c5698f7bf171c39068d48163f06dd5b9
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009
za7bBm000fv000fv0g!KboB#j-6LdvbbW?A2a${uxM@~;oMJ+>bY;SUNs+mOM0000P
zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQI5#_hT>t<AL`g(JR5(w4Qca6eVHBPy
ziuwhuf*1(;6)l1`t=dHG1_o-=PiSMC7-~BWvk$+&Ma6Xd)>ITlF};FcZ46ZWntQK~
zS5D7)L#MgaTzKw#?|Gl|obx{C-P_YWCX;F3VzGR*+wCo^ve|52+ibR9z*nQu_;gFh
z-W%-EE**iJz$b^pvF>)eE7Coq(P$G01TG-_4T*2D(oVo&Fx)@|S2CGg>J#<<tyXIV
zE-8v~DPXl)-^b%|g~{vnnq*o2r;e(sSK^`ryzWC$)-;W#(<#m8b3tmi+Z(^%zi_!+
zawd~eXS11zGiUn<0hsooSS+p<iv{)jebGTQ8dcF%2ZRIQIUvCw;v$>PhK9r8<q<%X
zdc7W3r15x6rBX>ltm1S!@3O;4KIBT(YLzCFiQurnU@-XO0hARMsMTsBh$)<7<K=cd
zOu7y%u!6H(nL3>gVLUAGT7N(O`w#NZN~J=DLV=piCY_y~X%PJmV{iSPgf92d<&#7r
z@!*OW$j7l*Y|SG1d|n&{&MS!5fCKpP0vG5QlSr4#<rCl?c+XJip%6j`k3dpc03^ah
zh`+<(@CHW8=;S;Y3|=5nMu$JpskhN+oJx{($QMwEpwbtg&!?~tERxM;g(nQ|ibZ+N
z<#JT7*OyrPz^mO+JRZ+&bdq+v-6{((F`Z5e;CfRkl@g*HM<Epjv)eK6L~x8d*f<3=
zuh+YZL?Q&k*i;IILIm*@?*S*ceD|)K%42kM1fm2{1>Z}2H?V$Yzx0W}0sq65%p*>>
QssI2007*qoM6N<$g8eyEzyJUM

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 3028dc7ae..ec1aa623a 100644
--- a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -3,18 +3,20 @@
      height="440" min_height="140" min_width="467" name="floater_about"
      rect_control="FloaterMediaRect" title="Media Browser" width="820">
 	<layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="800">
-		<layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
+		<layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
 		     width="800">
-			<button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
-			     width="55" />
-			<button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
-			     name="forward" width="60" />
-			<button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-			     left_delta="65" name="reload" width="70" />
-			<combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-			     left_delta="75" max_chars="255" name="address" width="540" />
-			<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-			     left_delta="545" name="go" width="55" />
+			<button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
+			     width="25" />
+			<button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
+			     name="forward" width="25" />
+			<button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" 
+			     left_delta="27" name="reload" width="25" />
+			<combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
+			     left_delta="29" max_chars="255" name="address" width="657" />
+			<button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" 
+			     left_delta="660" name="go" width="55" />
+			<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
+			     left_delta="58" name="home" width="35" /-->
 		</layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
 		     width="800">
@@ -31,8 +33,8 @@
     </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0"
 		     name="parcel_owner_controls" user_resize="false" width="540">
-			<button bottom="0" enabled="false" follows="left|top" height="20"
-			     label="Send Current URL to Parcel" left="0" name="assign" width="200" />
+			<button bottom="0" enabled="false" follows="left|top" height="22"
+			     label="Send Current URL To Parcel" left="0" name="assign" width="200" />
 		</layout_panel>
 		<layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
 		     width="540">
@@ -43,8 +45,8 @@
 			<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
 			     label="Always open in my web browser" left_delta="190" name="open_always"
 			     width="200" />
-			<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
-			     name="close" width="70" />
+			<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
+			     name="close" width="70" /-->
 		</layout_panel>
 	</layout_stack>
   <string name="home_page_url">

From 0130423d93913ab4f06e6e1c501faf3ac0587355 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 15 Oct 2011 04:46:35 +0200
Subject: [PATCH 06/23] Rev changed grid management incompatibly -.-

---
 indra/newview/app_settings/default_grids.xml | 16 ++++++++--------
 indra/newview/hippogridmanager.cpp           |  4 ++--
 indra/newview/llpanellogin.cpp               |  6 +++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/indra/newview/app_settings/default_grids.xml b/indra/newview/app_settings/default_grids.xml
index 83b33cf15..5d8c2a088 100755
--- a/indra/newview/app_settings/default_grids.xml
+++ b/indra/newview/app_settings/default_grids.xml
@@ -2,33 +2,34 @@
   <array>
 
     <map>
-      <key>default_grids_version</key><string>1</string>
+      <key>default_grids_version</key><string>2</string>
     </map>
 
     <!-- Second Life -->
     <map>
-      <key>gridnick</key><string>secondlife</string>
-      <key>gridname</key><string>Agni</string>
+      <key>gridname</key><string>Second Life</string>
       <key>platform</key><string>SecondLife</string>
       <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
-      <key>loginpage</key><string>http://secondlife.com/app/login/</string>
+	  <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
       <key>helperuri</key><string>https://secondlife.com/helpers/</string>
       <key>website</key><string>http://secondlife.com/</string>
       <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>render_compat</key><boolean>1</boolean>
+      <key>inventory_links</key><boolean>1</boolean>
     </map>
 
     <map>
-      <key>gridnick</key><string>secondlife_beta</string>
-      <key>gridname</key><string>Aditi</string>
+      <key>gridname</key><string>Second Life BETA</string>
       <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
-      <key>loginpage</key><string>http://secondlife.com/app/login/</string>
+	  <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
       <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
       <key>platform</key><string>SecondLife</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>render_compat</key><boolean>0</boolean>
+      <key>inventory_links</key><boolean>1</boolean>
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>version</key><integer>0</integer>
       <key>website</key><string>http://secondlife.com/</string>
@@ -37,7 +38,6 @@
 
     <!-- Local Host -->
     <map>
-      <key>gridnick</key><string>local</string>
       <key>gridname</key><string>Local Host</string>
       <key>platform</key><string>OpenSim</string>
       <key>loginuri</key><string>http://127.0.0.1:9000/</string>
diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 22989cb43..85ee8a369 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -796,7 +796,7 @@ void HippoGridManager::loadFromFile()
 {
 	mDefaultGridsVersion = 0;
 	// load user grid info
-	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml"), false);
+	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml"), false);
 	// merge default grid info, if newer. Force load, if list of grids is empty.
 	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
 	// merge grid info from web site, if newer. Force load, if list of grids is empty.
@@ -957,7 +957,7 @@ void HippoGridManager::saveFile()
 	}
 
 	// write client grid info file
-	std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml");
+	std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml");
 	llofstream file;
 	file.open(fileName.c_str());
 	if (file.is_open()) 
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index fde18272d..4db5502f4 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -942,7 +942,6 @@ void LLPanelLogin::loadLoginPage()
 	}
 
 	// Grid
-	oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
 
 	if (gHippoGridManager->getConnectedGrid()->isSecondLife()) {
 		// find second life grid from login URI
@@ -960,6 +959,11 @@ void LLPanelLogin::loadLoginPage()
 			}
 		}
 	}
+	else
+	{
+		oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
+	}
+		
 	
 	gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
 	gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());

From 4a910a80372515b25e9d4170dd4046d46515d67e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 14 Oct 2011 22:57:35 -0500
Subject: [PATCH 07/23] onVisibilityChange renamed to handleVisibilityChange.
 Added setVisibleCallback to LLPanel

---
 indra/llui/llpanel.cpp        | 19 +++++++++++++++++++
 indra/llui/llpanel.h          |  3 +++
 indra/newview/llmediactrl.cpp | 17 +++++++++++++----
 indra/newview/llmediactrl.h   |  5 +++--
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index cc7f7bdcc..9b40bfaeb 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -80,6 +80,7 @@ void LLPanel::init()
 
 	mPanelHandle.bind(this);
 	setTabStop(FALSE);
+	mVisibleSignal = NULL;
 }
 
 LLPanel::LLPanel()
@@ -123,6 +124,7 @@ LLPanel::LLPanel(const std::string& name, const std::string& rect_control, BOOL
 LLPanel::~LLPanel()
 {
 	storeRectControl();
+	delete mVisibleSignal;
 }
 
 // virtual
@@ -364,6 +366,13 @@ BOOL LLPanel::checkRequirements()
 	return TRUE;
 }
 
+void LLPanel::handleVisibilityChange ( BOOL new_visibility )
+{
+	LLUICtrl::handleVisibilityChange ( new_visibility );
+	if (mVisibleSignal)
+		(*mVisibleSignal)(this, LLSD(new_visibility) ); // Pass BOOL as LLSD
+}
+
 void LLPanel::setFocus(BOOL b)
 {
 	if( b )
@@ -1009,6 +1018,16 @@ void LLPanel::childSetControlName(const std::string& id, const std::string& cont
 	}
 }
 
+boost::signals2::connection LLPanel::setVisibleCallback( const commit_signal_t::slot_type& cb )
+{
+	if (!mVisibleSignal)
+	{
+		mVisibleSignal = new commit_signal_t();
+	}
+
+	return mVisibleSignal->connect(cb);
+}
+
 //virtual
 LLView* LLPanel::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index a442a94db..76b8833df 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -76,6 +76,7 @@ public:
 	/*virtual*/ BOOL 	isPanel() const;
 	/*virtual*/ void	draw();	
 	/*virtual*/ BOOL	handleKeyHere( KEY key, MASK mask );
+	/*virtual*/ void 	handleVisibilityChange ( BOOL new_visibility );
 	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
 	// Override to set not found list:
 	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
@@ -223,11 +224,13 @@ public:
 
 	static LLView*	fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 	
+	boost::signals2::connection setVisibleCallback( const commit_signal_t::slot_type& cb );
 protected:
 	// Override to set not found list
 	LLButton*		getDefaultButton() { return mDefaultBtn; }
 	LLCallbackMap::map_t mFactoryMap;
 
+	commit_signal_t* mVisibleSignal;		// Called when visibility changes, passes new visibility as LLSD()
 private:
 	// common construction logic
 	void init();
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 186dd2f27..0dfa20e14 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -63,7 +63,7 @@ const S32 MAX_TEXTURE_DIMENSION = 2048;
 static LLRegisterWidget<LLMediaCtrl> r("web_browser");
 
 LLMediaCtrl::LLMediaCtrl( const std::string& name, const LLRect& rect ) :
-	LLUICtrl( name, rect, FALSE, NULL, NULL ),
+	LLPanel( name, rect, FALSE ),
 	LLInstanceTracker<LLMediaCtrl, LLUUID>(LLUUID::generateNewID()),
 	mTextureDepthBytes( 4 ),
 	mWebBrowserImage( 0 ),
@@ -336,6 +336,15 @@ void LLMediaCtrl::onFocusLost()
 	LLUICtrl::onFocusLost();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+//
+
+BOOL LLMediaCtrl::postBuild ()
+{
+	setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
+	return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )
@@ -390,6 +399,7 @@ void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
 
 ////////////////////////////////////////////////////////////////////////////////
 //
+
 BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
 {
 	BOOL result = FALSE;
@@ -407,10 +417,10 @@ BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
+void LLMediaCtrl::onVisibilityChange ( const LLSD& new_visibility )
 {
 	// set state of frequent updates automatically if visibility changes
-	if ( new_visibility )
+	if ( new_visibility.asBoolean() )
 	{
 		mFrequentUpdates = true;
 	}
@@ -418,7 +428,6 @@ void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
 	{
 		mFrequentUpdates = false;
 	}
-	LLUICtrl::handleVisibilityChange(new_visibility);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index de0018988..b5254581f 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -46,7 +46,7 @@ class LLUICtrlFactory;
 ////////////////////////////////////////////////////////////////////////////////
 //
 class LLMediaCtrl :
-	public LLUICtrl,
+	public LLPanel,
 	public LLViewerMediaObserver,
 	public LLViewerMediaEventEmitter,
 	public LLInstanceTracker<LLMediaCtrl, LLUUID>
@@ -133,7 +133,7 @@ class LLMediaCtrl :
 		virtual BOOL handleUnicodeCharHere(llwchar uni_char);
 		virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
 		virtual void draw();
-		virtual void handleVisibilityChange ( BOOL curVisibilityIn );
+		virtual BOOL postBuild();
 
 		// focus overrides
 		void onFocusLost();
@@ -150,6 +150,7 @@ class LLMediaCtrl :
 		void convertInputCoords(S32& x, S32& y);
 
 	private:
+		void onVisibilityChange ( const LLSD& new_visibility );
 		static bool onClickLinkExternalTarget( const LLSD&, const LLSD& );
 
 		const S32 mTextureDepthBytes;

From e4329437810d5a49bc37438133944bfb9eb54fcf Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 14 Oct 2011 22:58:27 -0500
Subject: [PATCH 08/23] Nullcheck in LLMenuItemBranchDownGL::setHighlight  
 (getBranch())

---
 indra/llui/llmenugl.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 1e257d4fa..7d9e4bf4c 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1501,20 +1501,26 @@ void LLMenuItemBranchDownGL::openMenu( void )
 // set the hover status (called by it's menu)
 void LLMenuItemBranchDownGL::setHighlight( BOOL highlight )
 {
-	if (highlight == getHighlight()) return;
+ 	if (highlight == getHighlight())
+		return;
 
 	//NOTE: Purposely calling all the way to the base to bypass auto-open.
 	LLMenuItemGL::setHighlight(highlight);
+
+	LLMenuGL* branch = getBranch();
+	if (!branch)
+		return;
+	
 	if( !highlight)
 	{
-		if (getBranch()->getTornOff())
+		if (branch->getTornOff())
 		{
-			((LLFloater*)getBranch()->getParent())->setFocus(FALSE);
-			getBranch()->clearHoverItem();
+			((LLFloater*)branch->getParent())->setFocus(FALSE);
+			branch->clearHoverItem();
 		}
 		else
 		{
-			getBranch()->setVisible( FALSE );
+			branch->setVisible( FALSE );
 		}
 	}
 }

From ae0196e2c38ecf07888a1759ef81113903d5a988 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 14 Oct 2011 23:15:28 -0500
Subject: [PATCH 09/23] Inconsistent line endings in
 newview/llviewermessage.cpp

---
 indra/newview/llviewermessage.cpp | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 822a41a08..df51698f2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3681,17 +3681,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	U32 teleport_flags;
 	msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
 	
-	U32 region_size_x = 256;
-    msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
-
-    U32 region_size_y = 256;
-    msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
-
-    //and a little hack for Second Life compatibility
-    if (region_size_y == 0 || region_size_x == 0)
-    {
-	    region_size_x = 256;
-        region_size_y = 256;
+	U32 region_size_x = 256;
+    msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
+
+    U32 region_size_y = 256;
+    msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
+
+    //and a little hack for Second Life compatibility
+    if (region_size_y == 0 || region_size_x == 0)
+    {
+	    region_size_x = 256;
+        region_size_y = 256;
     }
 	
 	std::string seedCap;
@@ -4018,17 +4018,17 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
-	U32 region_size_x = 256;
-    msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
-
-    U32 region_size_y = 256;
-    msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
-
-    //and a little hack for Second Life compatibility
-    if (region_size_y == 0 || region_size_x == 0)
-    {
-        region_size_x = 256;
-        region_size_y = 256;
+	U32 region_size_x = 256;
+    msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
+
+    U32 region_size_y = 256;
+    msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
+
+    //and a little hack for Second Life compatibility
+    if (region_size_y == 0 || region_size_x == 0)
+    {
+        region_size_x = 256;
+        region_size_y = 256;
     }
 
 	send_complete_agent_movement(sim_host);

From 4987bceb618a98c1dbe9f3b4eb268152a3a2c620 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 14 Oct 2011 23:58:54 -0500
Subject: [PATCH 10/23] Navigation buttons now using icons for 'showcase' and
 'all' search panels.

---
 .../default/xui/en-us/floater_directory.xml   | 35 +++++++++++--------
 .../default/xui/en-us/floater_directory3.xml  | 35 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_directory.xml b/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 70475d28a..28151eb71 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -26,12 +26,12 @@
 			     name="search_editor" select_all_on_focus_received="false"
 			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
 			     width="160" spell_check="true" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-			     left="230" name="back_btn" width="70" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Forward" left="304" name="forward_btn" width="70" />
-      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Reload" left="388" name="reload_btn" width="50" />
+      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+           label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
+      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
 			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
 			     label="Search" left="121" name="search_btn" width="95" />
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
@@ -313,16 +313,21 @@
 		     width="778">
         <string name="searching_text">Searching...</string>
         <string name="not_found_text">None Found.</string>
-        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-          label="Back"
+        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-previous-4.png"
           left="10"
-          name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-          label="Forward" left_delta="75"
-          name="forward_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-         label="Reload" left_delta="85"
-         name="reload_btn" width="50" />
+          name="back_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-next-4.png"
+          left_delta="27"
+          name="forward_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+         label=""
+         image_overlay="view-refresh-5.png"
+         left_delta="27"
+         name="reload_btn" width="25" />
         <!-- No mature content checkbox, showcase is all PG -->
         <web_browser name="showcase_browser"
           bottom="25"
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory3.xml b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
index b66a70a1b..8823c5ba9 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
@@ -84,12 +84,12 @@
 			     name="search_editor" select_all_on_focus_received="false"
 			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
 			     width="160" spell_check="true" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-			     left="230" name="back_btn" width="70" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Forward" left="304" name="forward_btn" width="70" />
-      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-			     label="Reload" left="388" name="reload_btn" width="50" />
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25" 
+            label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
 			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
 			     label="Search" left="121" name="search_btn" width="95" />
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
@@ -371,16 +371,21 @@
 		     width="778">
         <string name="searching_text">Searching...</string>
         <string name="not_found_text">None Found.</string>
-        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-          label="Back"
+        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-previous-4.png"
           left="10"
-          name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-          label="Forward" left_delta="75"
-          name="forward_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-         label="Reload" left_delta="85"
-         name="reload_btn" width="50" />
+          name="back_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-next-4.png"
+          left_delta="27"
+          name="forward_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+         label=""
+         image_overlay="view-refresh-5.png"
+         left_delta="27"
+         name="reload_btn" width="25" />
         <!-- No mature content checkbox, showcase is all PG -->
         <web_browser name="showcase_browser"
           bottom="25"

From 02b58694bbc674c05fd601a3bffc5647617db4ef Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 15 Oct 2011 01:21:10 -0500
Subject: [PATCH 11/23] A required hack to LLMediaCtrl due to our LLPanel
 behaving far too differently right now. (Clicking isn't passed through like
 it should, and LLMediaCtrl is not currently parsing xml files so postBuild is
 not called.)

---
 indra/newview/llmediactrl.cpp | 7 +++++--
 indra/newview/llmediactrl.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 0dfa20e14..37f263ca8 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -63,7 +63,7 @@ const S32 MAX_TEXTURE_DIMENSION = 2048;
 static LLRegisterWidget<LLMediaCtrl> r("web_browser");
 
 LLMediaCtrl::LLMediaCtrl( const std::string& name, const LLRect& rect ) :
-	LLPanel( name, rect, FALSE ),
+	LLUICtrl( name, rect, FALSE, NULL, NULL),
 	LLInstanceTracker<LLMediaCtrl, LLUUID>(LLUUID::generateNewID()),
 	mTextureDepthBytes( 4 ),
 	mWebBrowserImage( 0 ),
@@ -341,7 +341,7 @@ void LLMediaCtrl::onFocusLost()
 
 BOOL LLMediaCtrl::postBuild ()
 {
-	setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
+	//setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
 	return true;
 }
 
@@ -395,6 +395,9 @@ void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
 	{
 		mMediaSource->setVisible( new_visibility );
 	}
+	LLUICtrl::handleVisibilityChange( new_visibility );
+	//Hack due to not being derived from LLPanel yet
+	LLMediaCtrl::onVisibilityChange(LLSD(new_visibility));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index b5254581f..341ea1407 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -46,7 +46,7 @@ class LLUICtrlFactory;
 ////////////////////////////////////////////////////////////////////////////////
 //
 class LLMediaCtrl :
-	public LLPanel,
+	public LLUICtrl,
 	public LLViewerMediaObserver,
 	public LLViewerMediaEventEmitter,
 	public LLInstanceTracker<LLMediaCtrl, LLUUID>

From 18e5b9461508ec9f1e165ab6e8612fa88193fa9e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 12:12:47 -0500
Subject: [PATCH 12/23] Shouldn't need this glFinish as SwapBuffers does the
 same thing.

---
 indra/llwindow/llwindowwin32.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 68162447f..c13ea7086 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -2919,7 +2919,6 @@ BOOL LLWindowWin32::resetDisplayResolution()
 
 void LLWindowWin32::swapBuffers()
 {
-	glFinish();
 	SwapBuffers(mhDC);
 }
 

From 06048ae8180399e299e3df62c60aa9f1cce962dc Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 12:16:57 -0500
Subject: [PATCH 13/23] Fixed avatars being invisible when using legacy path.
 Assumption of no shader use when LLGLSLShader::sNoFixedFunctionis false is
 not valid with Singularity.

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

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 4de0b48c8..14b2e20f9 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -826,7 +826,8 @@ void LLDrawPoolAvatar::beginSkinned()
 		}
 	}
 
-	if (LLGLSLShader::sNoFixedFunction)
+	//if (LLGLSLShader::sNoFixedFunction)	//Singu Note: sNoFixedFunction being false does not imply shaders are off, unlike in V3.
+	if (gPipeline.canUseVertexShaders())	//Check if shaders are REALLY used.
 	{
 		sVertexProgram->setAlphaRange(0.2f, 1.f);
 	}

From d1b19aa389df5e13093faa08b2c9e5fa27b60af3 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 12:19:43 -0500
Subject: [PATCH 14/23] Automatically disable new texture batching when using
 legacy renderpath.

---
 indra/llrender/llglslshader.cpp     | 3 ++-
 indra/newview/llviewershadermgr.cpp | 3 ++-
 indra/newview/llvovolume.cpp        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index d84158342..4490f87be 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -133,7 +133,8 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 	mProgramObject = glCreateProgramObjectARB();
 
 	static const LLCachedControl<bool> no_texture_indexing("ShyotlUseLegacyTextureBatching",false);
-	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing)
+	static const LLCachedControl<bool> use_legacy_path("ShyotlUseLegacyRenderPath", false);	//Legacy does not jive with new batching.
+	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing || use_legacy_path)
 	{ //force indexed texture channels to 1 if GL version is old (performance improvement for drivers with poor branching shader model support)
 		mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1);
 	}
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index f7f860385..f4a84fb2a 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -655,7 +655,8 @@ BOOL LLViewerShaderMgr::loadBasicShaders()
 	S32 ch = gGLManager.mNumTextureImageUnits-1;
 
 	static const LLCachedControl<bool> no_texture_indexing("ShyotlUseLegacyTextureBatching",false);
-	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing)
+	static const LLCachedControl<bool> use_legacy_path("ShyotlUseLegacyRenderPath", false); //Legacy does not jive with new batching.
+	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing || use_legacy_path)
 	{ //force to 1 texture index channel for old drivers
 		ch = 1;
 	}
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 9029a8188..f07c9c37d 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3927,7 +3927,8 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
 	S32 texture_index_channels = gGLManager.mNumTextureImageUnits-1; //always reserve one for shiny for now just for simplicity
 	
 	static const LLCachedControl<bool> no_texture_indexing("ShyotlUseLegacyTextureBatching",false);
-	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing)
+	static const LLCachedControl<bool> use_legacy_path("ShyotlUseLegacyRenderPath", false);	//Legacy does not jive with new batching.
+	if (gGLManager.mGLVersion < 3.1f || no_texture_indexing || use_legacy_path)
 	{
 		texture_index_channels = 1;
 	}

From c413d62536b508f90fc2430dec976321d53ef508 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 14:11:10 -0500
Subject: [PATCH 15/23] Decouple RenderUseFBO from RenderDeferred, as toggling
 deferred would leave RenderUseFBO enabled regardless of previous setting.

---
 indra/newview/llappviewer.cpp       |  3 ++-
 indra/newview/llviewercontrol.cpp   | 29 +++++++++++++++++++++++------
 indra/newview/llviewershadermgr.cpp |  3 ---
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8e2d9f0b1..5dd38f79a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -495,7 +495,8 @@ static void settings_to_globals()
 
 static void settings_modify()
 {
-	LLRenderTarget::sUseFBO				= gSavedSettings.getBOOL("RenderUseFBO");
+	bool can_defer = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred");
+	LLRenderTarget::sUseFBO				= gSavedSettings.getBOOL("RenderUseFBO") || (gSavedSettings.getBOOL("RenderDeferred") && can_defer);
 	LLVOAvatar::sUseImpostors			= gSavedSettings.getBOOL("RenderUseImpostors");
 	LLVOSurfacePatch::sLODFactor		= gSavedSettings.getF32("RenderTerrainLODFactor");
 	LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index b5a78b01d..54ccb94dc 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -445,17 +445,34 @@ static bool handleRenderLocalLightsChanged(const LLSD& newvalue)
 	return true;
 }
 
+static bool handleRenderDeferredChanged(const LLSD& newvalue)
+{
+	bool can_defer = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred");
+	bool old_deferred = !newvalue.asBoolean() && can_defer;
+	LLRenderTarget::sUseFBO = (newvalue.asBoolean() && can_defer) || gSavedSettings.getBOOL("RenderUseFBO");
+	if (gPipeline.isInit())
+	{
+		gPipeline.updateRenderDeferred();
+		gPipeline.releaseGLBuffers();
+		gPipeline.createGLBuffers();
+		gPipeline.resetVertexBuffers();
+		if (old_deferred != newvalue.asBoolean())
+		{
+			LLViewerShaderMgr::instance()->setShaders();
+		}
+	}
+	return true;
+}
+
 static bool handleRenderUseFBOChanged(const LLSD& newvalue)
 {
-	LLRenderTarget::sUseFBO = newvalue.asBoolean();
+	bool can_defer = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred");
+	LLRenderTarget::sUseFBO = newvalue.asBoolean() || (gSavedSettings.getBOOL("RenderDeferred") && can_defer);
 	if (gPipeline.isInit())
 	{
 		gPipeline.releaseGLBuffers();
 		gPipeline.createGLBuffers();
-		if (LLPipeline::sRenderDeferred && LLRenderTarget::sUseFBO)
-		{
-			LLViewerShaderMgr::instance()->setShaders();
-		}
+		gPipeline.resetVertexBuffers();
 	}
 	return true;
 }
@@ -682,7 +699,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("RenderDebugGL")->getSignal()->connect(boost::bind(&handleRenderDebugGLChanged, _2));
 	gSavedSettings.getControl("RenderDebugPipeline")->getSignal()->connect(boost::bind(&handleRenderDebugPipelineChanged, _2));
 	gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _2));
-	gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+	gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleRenderDeferredChanged, _2));
 	gSavedSettings.getControl("RenderShadowDetail")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
 	gSavedSettings.getControl("RenderDeferredSSAO")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
 	gSavedSettings.getControl("RenderDeferredGI")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index f4a84fb2a..4bc79c3f3 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -426,9 +426,6 @@ void LLViewerShaderMgr::setShaders()
 				deferred_class = 1;
 			}
 
-			//make sure framebuffer objects are enabled
-			gSavedSettings.setBOOL("RenderUseFBO", TRUE);
-
 			//make sure hardware skinning is enabled
 			gSavedSettings.setBOOL("RenderAvatarVP", TRUE);
 		}

From 67230a3290f6b89962480a2806ddd05b86000ed0 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 14:11:30 -0500
Subject: [PATCH 16/23] Line-ending fixup.

---
 indra/newview/llstartup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index ba88d237a..11e310cb9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -372,7 +372,7 @@ bool idle_startup()
 	static U64 first_sim_handle = 0;
 	static LLHost first_sim;
 	static std::string first_sim_seed_cap;
-	static U32 first_sim_size_x = 256;
+	static U32 first_sim_size_x = 256;
 	static U32 first_sim_size_y = 256;
 
 	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);

From 8ce30e9ff7cabc0aa04cb031c7d7a4acd10cbebf Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 19:05:37 -0500
Subject: [PATCH 17/23] Fixed a crash for hardware lacking ARB_shader_objects
 extension support.

---
 indra/llrender/llglslshader.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 4490f87be..d54bdffb2 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -445,9 +445,12 @@ void LLGLSLShader::unbind()
 
 void LLGLSLShader::bindNoShader(void)
 {
-	glUseProgramObjectARB(0);
-	sCurBoundShader = 0;
-	sCurBoundShaderPtr = NULL;
+	if (gGLManager.mHasShaderObjects)
+	{
+		glUseProgramObjectARB(0);
+		sCurBoundShader = 0;
+		sCurBoundShaderPtr = NULL;
+	}
 }
 
 S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode)

From 58ea5f88dce10a8db1532db90878337c16b25807 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 19:06:22 -0500
Subject: [PATCH 18/23] Spew llinfos for opengl procs that aren't found.

---
 indra/llrender/llgl.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 40baf7b33..712582540 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -68,6 +68,16 @@ BOOL gGLActive = FALSE;
 
 std::ofstream gFailLog;
 
+void* gl_get_proc_address(const char *pStr)
+{
+	void* pPtr = (void*)GLH_EXT_GET_PROC_ADDRESS(pStr);
+	if(!pPtr)
+		llinfos << "Failed to find symbol '" << pStr << "'" << llendl;
+	return pPtr;
+}
+#undef GLH_EXT_GET_PROC_ADDRESS
+#define GLH_EXT_GET_PROC_ADDRESS(p)   gl_get_proc_address(p) 
+
 void ll_init_fail_log(std::string filename)
 {
 	gFailLog.open(filename.c_str());

From 4446b0fbadad6841f185d95fb8789aed78f36e83 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 17 Oct 2011 19:19:36 -0500
Subject: [PATCH 19/23] Give each reserved attribute a consistent index across
 all shaders.

---
 indra/llrender/llglslshader.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index d54bdffb2..5645c9061 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -38,6 +38,7 @@
 #include "llfile.h"
 #include "llrender.h"
 #include "llcontrol.h"
+#include "llvertexbuffer.h"
 
 #if LL_DARWIN
 #include "OpenGL/OpenGL.h"
@@ -260,6 +261,13 @@ void LLGLSLShader::attachObjects(GLhandleARB* objects, S32 count)
 
 BOOL LLGLSLShader::mapAttributes(const vector<string> * attributes)
 {
+	//before linking, make sure reserved attributes always have consistent locations
+	for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++)
+	{
+		const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str();
+		glBindAttribLocationARB(mProgramObject, i, (const GLcharARB *) name);
+	}
+	
 	//link the program
 	BOOL res = link();
 
@@ -333,7 +341,7 @@ void LLGLSLShader::mapUniform(GLint index, const vector<string> * uniforms)
 		for (S32 i = 0; i < (S32) LLShaderMgr::instance()->mReservedUniforms.size(); i++)
 		{
 			if ( (mUniform[i] == -1)
-				&& (LLShaderMgr::instance()->mReservedUniforms[i].compare(0, length, name, LLShaderMgr::instance()->mReservedUniforms[i].length()) == 0))
+				&& (LLShaderMgr::instance()->mReservedUniforms[i] == name))
 			{
 				//found it
 				mUniform[i] = location;
@@ -347,7 +355,7 @@ void LLGLSLShader::mapUniform(GLint index, const vector<string> * uniforms)
 			for (U32 i = 0; i < uniforms->size(); i++)
 			{
 				if ( (mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] == -1)
-					&& ((*uniforms)[i].compare(0, length, name, (*uniforms)[i].length()) == 0))
+					&& ((*uniforms)[i] == name))
 				{
 					//found it
 					mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] = location;
@@ -411,6 +419,7 @@ void LLGLSLShader::bind()
 	gGL.flush();
 	if (gGLManager.mHasShaderObjects)
 	{
+		LLVertexBuffer::unbind();
 		glUseProgramObjectARB(mProgramObject);
 		sCurBoundShader = mProgramObject;
 		sCurBoundShaderPtr = this;
@@ -436,6 +445,7 @@ void LLGLSLShader::unbind()
 				stop_glerror();
 			}
 		}
+		LLVertexBuffer::unbind();
 		glUseProgramObjectARB(0);
 		sCurBoundShader = 0;
 		sCurBoundShaderPtr = NULL;
@@ -445,6 +455,7 @@ void LLGLSLShader::unbind()
 
 void LLGLSLShader::bindNoShader(void)
 {
+	LLVertexBuffer::unbind();
 	if (gGLManager.mHasShaderObjects)
 	{
 		glUseProgramObjectARB(0);

From 82b0171a865515aa886724b829f88151d09b8a90 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 18 Oct 2011 09:33:20 -0500
Subject: [PATCH 20/23] Workaround for mac startup hardlock. (STORM-1641)

---
 indra/llcommon/llqueuedthread.cpp | 7 ++++++-
 indra/llcommon/llqueuedthread.h   | 2 +-
 indra/llcommon/llworkerthread.cpp | 4 ++--
 indra/llcommon/llworkerthread.h   | 2 +-
 indra/newview/lltexturefetch.cpp  | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 2325efc38..fb598bbb0 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -38,7 +38,7 @@
 //============================================================================
 
 // MAIN THREAD
-LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded) :
+LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded, bool should_pause) :
 	LLThread(name),
 	mThreaded(threaded),
 	mIdleThread(TRUE),
@@ -47,6 +47,11 @@ LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded) :
 {
 	if (mThreaded)
 	{
+		if(should_pause)
+		{
+			pause() ; //call this before start the thread.
+		}
+
 		start();
 	}
 }
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h
index f0c36896c..8da383dff 100644
--- a/indra/llcommon/llqueuedthread.h
+++ b/indra/llcommon/llqueuedthread.h
@@ -154,7 +154,7 @@ public:
 	static handle_t nullHandle() { return handle_t(0); }
 	
 public:
-	LLQueuedThread(const std::string& name, bool threaded = true);
+	LLQueuedThread(const std::string& name, bool threaded = true, bool should_pause = false);
 	virtual ~LLQueuedThread();	
 	virtual void shutdown();
 	
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
index d9adef5fc..7581a012e 100644
--- a/indra/llcommon/llworkerthread.cpp
+++ b/indra/llcommon/llworkerthread.cpp
@@ -40,8 +40,8 @@
 //============================================================================
 // Run on MAIN thread
 
-LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) :
-	LLQueuedThread(name, threaded)
+LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded, bool should_pause) :
+	LLQueuedThread(name, threaded, should_pause)
 {
 	mDeleteMutex = new LLMutex;
 }
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index 117dc05cc..76c715076 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -89,7 +89,7 @@ private:
 	LLMutex* mDeleteMutex;
 	
 public:
-	LLWorkerThread(const std::string& name, bool threaded = true);
+	LLWorkerThread(const std::string& name, bool threaded = true, bool should_pause = false);
 	~LLWorkerThread();
 
 	/*virtual*/ S32 update(U32 max_time_ms);
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 1e09a5154..eee9756dc 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1962,7 +1962,7 @@ bool LLTextureFetchWorker::writeToCacheComplete()
 // public
 
 LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* imagedecodethread, bool threaded, bool qa_mode)
-	: LLWorkerThread("TextureFetch", threaded),
+	: LLWorkerThread("TextureFetch", threaded, true),
 	  mDebugCount(0),
 	  mDebugPause(FALSE),
 	  mPacketCount(0),

From d88f6966041a184f8503e57423e19141c974e7fc Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 18 Oct 2011 19:44:08 -0500
Subject: [PATCH 21/23] Brought over LLInventoryIcon

---
 indra/newview/CMakeLists.txt           |   2 +
 indra/newview/llfloaterbuy.cpp         |   6 +-
 indra/newview/llfloaterbuycontents.cpp |   5 +-
 indra/newview/llfloatercustomize.cpp   |   4 +-
 indra/newview/llfloateropenobject.cpp  |   3 +-
 indra/newview/llgroupnotify.cpp        |   4 +-
 indra/newview/llinventorybridge.cpp    |  90 ++++--------
 indra/newview/llinventorybridge.h      | 102 +++-----------
 indra/newview/llinventoryicon.cpp      | 183 +++++++++++++++++++++++++
 indra/newview/llinventoryicon.h        | 102 ++++++++++++++
 indra/newview/llinventoryview.cpp      | 141 -------------------
 indra/newview/llinventoryview.h        |  18 ---
 indra/newview/llpanelgroupnotices.cpp  |   8 +-
 indra/newview/llpanelinventory.cpp     |  27 ++--
 indra/newview/lltexlayerparams.cpp     |   2 +-
 indra/newview/llwearabletype.cpp       |  76 +++++++---
 indra/newview/llwearabletype.h         |   4 +
 17 files changed, 425 insertions(+), 352 deletions(-)
 create mode 100644 indra/newview/llinventoryicon.cpp
 create mode 100644 indra/newview/llinventoryicon.h

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3d3298acc..ce601470f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -280,6 +280,7 @@ set(viewer_SOURCE_FILES
     llinventorybackup.cpp
     llinventorybridge.cpp
     llinventoryclipboard.cpp
+    llinventoryicon.cpp
     llinventorymodel.cpp
     llinventoryview.cpp
     lljoystickbutton.cpp
@@ -762,6 +763,7 @@ set(viewer_HEADER_FILES
     llinventorybackup.h
     llinventorybridge.h
     llinventoryclipboard.h
+    llinventoryicon.h
     llinventorymodel.h
     llinventoryview.h
     lljoystickbutton.h
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index b7de17cc6..7f598ac5b 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -44,7 +44,7 @@
 #include "llalertdialog.h"
 #include "llinventorymodel.h"	// for gInventory
 #include "llinventorydefines.h"
-#include "llinventoryview.h"	// for get_item_icon
+#include "llinventoryicon.h"
 #include "llnotificationsutil.h"
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
@@ -156,7 +156,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	LLSD row;
 
 	// Compute icon for this item
-	std::string icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
+	std::string icon_name = LLInventoryIcon::getIconName(LLAssetType::AT_OBJECT, 
 									 LLInventoryType::IT_OBJECT,
 									 0x0, FALSE);
 
@@ -258,7 +258,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 			item_is_multi = TRUE;
 		}
 
-		std::string icon_name = get_item_icon_name(inv_item->getType(), 
+		std::string icon_name = LLInventoryIcon::getIconName(inv_item->getType(), 
 							 inv_item->getInventoryType(),
 							 inv_item->getFlags(),
 							 item_is_multi);
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index cb72659cb..38ed371f2 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -47,7 +47,8 @@
 #include "llcheckboxctrl.h"
 #include "llinventorymodel.h"	// for gInventory
 #include "llinventorydefines.h"
-#include "llinventoryview.h"	// for get_item_icon
+#include "llinventoryview.h"
+#include "llinventoryicon.h"
 #include "llnotificationsutil.h"
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
@@ -225,7 +226,7 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
 			item_is_multi = TRUE;
 		}
 
-		std::string icon_name = get_item_icon_name(inv_item->getType(), 
+		std::string icon_name =LLInventoryIcon::getIconName(inv_item->getType(), 
 								 inv_item->getInventoryType(),
 								 inv_item->getFlags(),
 								 item_is_multi);
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 5e6f8f1a5..b43d47177 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -53,7 +53,7 @@
 #include "lltabcontainervertical.h"
 #include "llviewerwindow.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llinventoryicon.h"
 #include "lltextbox.h"
 #include "lllineeditor.h"
 #include "llviewertexturelist.h"
@@ -511,7 +511,7 @@ BOOL LLPanelEditWearable::postBuild()
 	/*std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
 										 "inv_item_clothing.tga" :
 										 "inv_item_skin.tga" );*/
-	std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
+	std::string icon_name = LLInventoryIcon::getIconName(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
 
 	childSetValue("icon", icon_name);
 
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 3c319a608..6a762d00a 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -46,8 +46,9 @@
 
 #include "llagent.h"			// for agent id
 #include "llalertdialog.h"
-#include "llinventoryview.h"
+#include "llinventorybridge.h"
 #include "llinventorymodel.h"
+#include "llinventoryview.h"
 #include "llpanelinventory.h"
 #include "llselectmgr.h"
 #include "lluiconstants.h"
diff --git a/indra/newview/llgroupnotify.cpp b/indra/newview/llgroupnotify.cpp
index 3648decc4..59ac55138 100644
--- a/indra/newview/llgroupnotify.cpp
+++ b/indra/newview/llgroupnotify.cpp
@@ -46,7 +46,7 @@
 #include "llui.h"
 #include "llviewercontrol.h"
 #include "llfloatergroupinfo.h"
-#include "llinventoryview.h"
+#include "llinventoryicon.h"
 #include "llinventory.h"
 
 #include "llglheaders.h"
@@ -218,7 +218,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 	{
 			addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::getFontSansSerif()));
 
-			LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType,
+			LLUIImagePtr item_icon = LLInventoryIcon::getIcon(mInventoryOffer->mType,
 													LLInventoryType::IT_TEXTURE,
 													0, FALSE);
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 4cfe6fa91..94e3a4d73 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -37,6 +37,7 @@
 #include "llinventoryview.h"
 #include "llinventorybridge.h"
 #include "llinventorydefines.h"
+#include "llinventoryicon.h"
 
 #include "message.h"
 
@@ -122,6 +123,18 @@
 #include "llattachmentsmgr.h"
 // [/RLVa:KB]
 
+typedef std::pair<LLUUID, LLUUID> two_uuids_t;
+typedef std::list<two_uuids_t> two_uuids_list_t;
+
+struct LLMoveInv
+{
+	LLUUID mObjectID;
+	LLUUID mCategoryID;
+	two_uuids_list_t mMoveList;
+	void (*mCallback)(S32, void*);
+	void* mUserData;
+};
+
 // Helpers
 // bug in busy count inc/dec right now, logic is complex... do we really need it?
 void inc_busy_count()
@@ -162,47 +175,6 @@ void gotAssetForSaveItemAs(LLVFS *vfs,
 									   void* user_data, S32 status, LLExtStat ext_status);
 // </edit>
 
-std::string ICON_NAME[ICON_NAME_COUNT] =
-{
-	"inv_item_texture.tga",
-	"inv_item_sound.tga",
-	"inv_item_callingcard_online.tga",
-	"inv_item_callingcard_offline.tga",
-	"inv_item_landmark.tga",
-	"inv_item_landmark_visited.tga",
-	"inv_item_script.tga",
-	"inv_item_clothing.tga",
-	"inv_item_object.tga",
-	"inv_item_object_multi.tga",
-	"inv_item_notecard.tga",
-	"inv_item_skin.tga",
-	"inv_item_snapshot.tga",
-
-	"inv_item_shape.tga",
-	"inv_item_skin.tga",
-	"inv_item_hair.tga",
-	"inv_item_eyes.tga",
-	"inv_item_shirt.tga",
-	"inv_item_pants.tga",
-	"inv_item_shoes.tga",
-	"inv_item_socks.tga",
-	"inv_item_jacket.tga",
-	"inv_item_gloves.tga",
-	"inv_item_undershirt.tga",
-	"inv_item_underpants.tga",
-	"inv_item_skirt.tga",
-	"inv_item_alpha.tga",
-	"inv_item_tattoo.tga",
-	"inv_item_physics.png",
-
-	"inv_item_animation.tga",
-	"inv_item_gesture.tga",
-
-	"inv_link_item.tga",
-	"inv_link_folder.tga"
-	"inv_item_mesh.png"
-};
-
 struct LLWearInfo
 {
 	LLUUID	mCategoryID;
@@ -1051,7 +1023,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
 		{
 				llwarns << LLAssetType::lookup(asset_type) << " asset has inventory type " << LLInventoryType::lookupHumanReadable(inv_type) << " on uuid " << uuid << llendl;
 		}
-		new_listener = new LLScriptBridge(inventory, uuid);
+		new_listener = new LLItemBridge(inventory, uuid);
 		break;
 
 	case LLAssetType::AT_OBJECT:
@@ -1332,13 +1304,12 @@ LLUIImagePtr LLItemBridge::getIcon() const
 	LLInventoryObject *obj = getInventoryObject();
 	if (obj) 
 	{
-		return get_item_icon(	obj->getType(),
-								LLInventoryType::IT_NONE,
-								0,
-								mIsLink);
+		return LLInventoryIcon::getIcon(obj->getType(),
+										LLInventoryType::IT_NONE,
+										mIsLink);
 	}
 	
-	return LLUI::getUIImage(ICON_NAME[OBJECT_ICON_NAME]);
+	return LLInventoryIcon::getIcon(LLInventoryIcon::ICONNAME_OBJECT);
 }
 
 PermissionMask LLItemBridge::getPermissionMask() const
@@ -3167,22 +3138,13 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 	return accept;
 }
 
-// +=================================================+
-// |        LLScriptBridge (DEPRECATED)              |
-// +=================================================+
-
-LLUIImagePtr LLScriptBridge::getIcon() const
-{
-	return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
-}
-
 // +=================================================+
 // |        LLTextureBridge                          |
 // +=================================================+
 
 LLUIImagePtr LLTextureBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_TEXTURE, mInvType, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_TEXTURE, mInvType);
 }
 	
 void open_texture(const LLUUID& item_id, 
@@ -3333,7 +3295,7 @@ LLLandmarkBridge::LLLandmarkBridge(LLInventoryPanel* inventory,
 
 LLUIImagePtr LLLandmarkBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, mVisited, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, mVisited, FALSE);
 }
 
 void LLLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
@@ -3538,7 +3500,7 @@ LLUIImagePtr LLCallingCardBridge::getIcon() const
 	{
 		online = LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID());
 	}
-	return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, online, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, online, FALSE);
 }
 
 std::string LLCallingCardBridge::getLabelSuffix() const
@@ -4020,7 +3982,7 @@ BOOL LLObjectBridge::isItemRemovable()
 
 LLUIImagePtr LLObjectBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_OBJECT, mInvType, mAttachPt, mIsMultiObject );
+	return LLInventoryIcon::getIcon(LLAssetType::AT_OBJECT, mInvType, mAttachPt, mIsMultiObject );
 }
 
 LLInventoryObject* LLObjectBridge::getObject() const
@@ -5255,7 +5217,7 @@ std::string LLWearableBridge::getLabelSuffix() const
 
 LLUIImagePtr LLWearableBridge::getIcon() const
 {
-	return get_item_icon(mAssetType, mInvType, mWearableType, FALSE);
+	return LLInventoryIcon::getIcon(mAssetType, mInvType, mWearableType, FALSE);
 }
 
 // virtual
@@ -5618,9 +5580,9 @@ LLUIImagePtr LLLinkItemBridge::getIcon() const
 		U32 attachment_point = (item->getFlags() & 0xff); // low byte of inventory flags
 		bool is_multi =  LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & item->getFlags();
 
-		return get_item_icon(item->getActualType(), item->getInventoryType(), attachment_point, is_multi);
+		return LLInventoryIcon::getIcon(item->getActualType(), item->getInventoryType(), attachment_point, is_multi);
 	}
-	return get_item_icon(LLAssetType::AT_LINK, LLInventoryType::IT_NONE, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_LINK, LLInventoryType::IT_NONE, 0, FALSE);
 }
 
 void LLLinkItemBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
@@ -5721,7 +5683,7 @@ const LLUUID &LLLinkFolderBridge::getFolderID() const
 
 LLUIImagePtr LLMeshBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_TEXTURE, LLInventoryType::IT_TEXTURE, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_MESH, LLInventoryType::IT_MESH, 0, FALSE);
 }
 
 void LLMeshBridge::openItem()
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 5b385f538..f9f99d176 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -47,65 +47,8 @@ class LLMenuGL;
 class LLCallingCardObserver;
 class LLViewerJointAttachment;
 
-enum EInventoryIcon
-{
-	TEXTURE_ICON_NAME,
-	SOUND_ICON_NAME,
-	CALLINGCARD_ONLINE_ICON_NAME,
-	CALLINGCARD_OFFLINE_ICON_NAME,
-	LANDMARK_ICON_NAME,
-	LANDMARK_VISITED_ICON_NAME,
-	SCRIPT_ICON_NAME,
-	CLOTHING_ICON_NAME,
-	OBJECT_ICON_NAME,
-	OBJECT_MULTI_ICON_NAME,
-	NOTECARD_ICON_NAME,
-	BODYPART_ICON_NAME,
-	SNAPSHOT_ICON_NAME,
-
-	BODYPART_SHAPE_ICON_NAME,
-	BODYPART_SKIN_ICON_NAME,
-	BODYPART_HAIR_ICON_NAME,
-	BODYPART_EYES_ICON_NAME,
-	CLOTHING_SHIRT_ICON_NAME,
-	CLOTHING_PANTS_ICON_NAME,
-	CLOTHING_SHOES_ICON_NAME,
-	CLOTHING_SOCKS_ICON_NAME,
-	CLOTHING_JACKET_ICON_NAME,
-	CLOTHING_GLOVES_ICON_NAME,
-	CLOTHING_UNDERSHIRT_ICON_NAME,
-	CLOTHING_UNDERPANTS_ICON_NAME,
-	CLOTHING_SKIRT_ICON_NAME,
-	CLOTHING_ALPHA_ICON_NAME,
-	CLOTHING_TATTOO_ICON_NAME,
-	CLOTHING_PHYSICS_ICON_NAME,
-	
-	ANIMATION_ICON_NAME,
-	GESTURE_ICON_NAME,
-
-	LINKITEM_ICON_NAME,
-	LINKFOLDER_ICON_NAME,
-	MESH_ICON_NAME,
-
-	ICON_NAME_COUNT
-};
-
-extern std::string ICON_NAME[ICON_NAME_COUNT];
-
-typedef std::pair<LLUUID, LLUUID> two_uuids_t;
-typedef std::list<two_uuids_t> two_uuids_list_t;
-typedef std::pair<LLUUID, two_uuids_list_t> uuid_move_list_t;
 typedef std::vector<std::string> menuentry_vec_t;
 
-struct LLMoveInv
-{
-	LLUUID mObjectID;
-	LLUUID mCategoryID;
-	two_uuids_list_t mMoveList;
-	void (*mCallback)(S32, void*);
-	void* mUserData;
-};
-
 struct LLAttachmentRezAction
 {
 	LLUUID	mItemID;
@@ -417,18 +360,6 @@ private:
 	menuentry_vec_t		mDisabledItems;
 };
 
-// DEPRECATED
-class LLScriptBridge : public LLItemBridge
-{
-	friend class LLInvFVBridge;
-public:
-	LLUIImagePtr getIcon() const;
-
-protected:
-	LLScriptBridge( LLInventoryPanel* inventory, const LLUUID& uuid ) :
-		LLItemBridge(inventory, uuid) {}
-};
-
 
 class LLTextureBridge : public LLItemBridge
 {
@@ -647,23 +578,30 @@ protected:
 	static std::string sPrefix;
 };
 
-class LLMeshBridge : public LLItemBridge
-{
-    friend class LLInvFVBridge;
-public:
-    virtual LLUIImagePtr getIcon() const;
-    virtual void openItem();
-    virtual void previewItem();
-    virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
-
-protected:
-    LLMeshBridge(LLInventoryPanel* inventory, 
-             const LLUUID& uuid) :
-                       LLItemBridge(inventory, uuid) {}
+class LLMeshBridge : public LLItemBridge
+{
+    friend class LLInvFVBridge;
+public:
+    virtual LLUIImagePtr getIcon() const;
+    virtual void openItem();
+    virtual void previewItem();
+    virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
+
+protected:
+    LLMeshBridge(LLInventoryPanel* inventory, 
+             const LLUUID& uuid) :
+                       LLItemBridge(inventory, uuid) {}
 };
 
 void rez_attachment(LLViewerInventoryItem* item, 
 					LLViewerJointAttachment* attachment,
 					bool replace = false);
 
+// Move items from an in-world object's "Contents" folder to a specified
+// folder in agent inventory.
+BOOL move_inv_category_world_to_agent(const LLUUID& object_id, 
+									  const LLUUID& category_id,
+									  BOOL drop,
+									  void (*callback)(S32, void*) = NULL,
+									  void* user_data = NULL);
 #endif // LL_LLINVENTORYBRIDGE_H
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
new file mode 100644
index 000000000..1580dad5e
--- /dev/null
+++ b/indra/newview/llinventoryicon.cpp
@@ -0,0 +1,183 @@
+/** 
+ * @file llinventoryicon.cpp
+ * @brief Implementation of the inventory icon.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llinventoryicon.h"
+
+#include "lldictionary.h"
+#include "llinventorydefines.h"
+#include "llui.h"
+#include "llwearabletype.h"
+
+struct IconEntry : public LLDictionaryEntry
+{
+	IconEntry(const std::string &item_name)
+		:
+		LLDictionaryEntry(item_name)
+	{}
+};
+
+class LLIconDictionary : public LLSingleton<LLIconDictionary>,
+						 public LLDictionary<LLInventoryIcon::EIconName, IconEntry>
+{
+public:
+	LLIconDictionary();
+};
+
+LLIconDictionary::LLIconDictionary()
+{
+	addEntry(LLInventoryIcon::ICONNAME_TEXTURE, 				new IconEntry("inv_item_texture.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_SOUND, 					new IconEntry("inv_item_sound.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CALLINGCARD_ONLINE, 		new IconEntry("inv_item_callingcard_online.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CALLINGCARD_OFFLINE, 	new IconEntry("inv_item_callingcard_offline.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_LANDMARK, 				new IconEntry("inv_item_landmark.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_LANDMARK_VISITED, 		new IconEntry("inv_item_landmark_visited.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_SCRIPT, 					new IconEntry("inv_item_script.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING, 				new IconEntry("inv_item_clothing.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_OBJECT, 					new IconEntry("inv_item_object.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_OBJECT_MULTI, 			new IconEntry("inv_item_object_multi.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_NOTECARD, 				new IconEntry("inv_item_notecard.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_BODYPART, 				new IconEntry("inv_item_skin.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_SNAPSHOT, 				new IconEntry("inv_item_snapshot.tga"));
+
+	addEntry(LLInventoryIcon::ICONNAME_BODYPART_SHAPE, 			new IconEntry("inv_item_shape.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_BODYPART_SKIN, 			new IconEntry("inv_item_skin.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_BODYPART_HAIR, 			new IconEntry("inv_item_hair.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_BODYPART_EYES, 			new IconEntry("inv_item_eyes.tga"));
+
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_SHIRT, 			new IconEntry("inv_item_skirt.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PANTS, 			new IconEntry("inv_item_pants.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_SHOES, 			new IconEntry("inv_item_shoes.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_SOCKS, 			new IconEntry("inv_item_socks.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_JACKET, 		new IconEntry("inv_item_jacket.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_GLOVES, 		new IconEntry("inv_item_gloves.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_UNDERSHIRT, 	new IconEntry("inv_item_undershirt.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_UNDERPANTS, 	new IconEntry("inv_item_underpants.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_SKIRT, 			new IconEntry("inv_item_skirt.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_ALPHA, 			new IconEntry("inv_item_alpha.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_TATTOO, 		new IconEntry("inv_item_tattoo.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_ANIMATION, 				new IconEntry("inv_item_animation.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_GESTURE, 				new IconEntry("inv_item_gesture.tga"));
+
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, 		new IconEntry("inv_item_physics.tga"));
+
+	addEntry(LLInventoryIcon::ICONNAME_LINKITEM, 				new IconEntry("inv_link_item.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, 				new IconEntry("inv_link_folder.tga"));
+	addEntry(LLInventoryIcon::ICONNAME_MESH,	 				new IconEntry("inv_item_mesh.tga"));
+
+	addEntry(LLInventoryIcon::ICONNAME_INVALID, 				new IconEntry("Inv_Invalid.png"));
+
+	addEntry(LLInventoryIcon::ICONNAME_NONE, 					new IconEntry("NONE"));
+}
+
+LLUIImagePtr LLInventoryIcon::getIcon(LLAssetType::EType asset_type,
+									  LLInventoryType::EType inventory_type,
+									  U32 misc_flag,
+									  BOOL item_is_multi)
+{
+	const std::string& icon_name = getIconName(asset_type, inventory_type, misc_flag, item_is_multi);
+	return LLUI::getUIImage(icon_name);
+}
+
+LLUIImagePtr LLInventoryIcon::getIcon(EIconName idx)
+{
+	return LLUI::getUIImage(getIconName(idx));
+}
+
+const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
+												LLInventoryType::EType inventory_type,
+												U32 misc_flag,
+												BOOL item_is_multi)
+{
+	EIconName idx = ICONNAME_OBJECT;
+	if (item_is_multi)
+	{
+		idx = ICONNAME_OBJECT_MULTI;
+		return getIconName(idx);
+	}
+	
+	switch(asset_type)
+	{
+		case LLAssetType::AT_TEXTURE:
+			idx = (inventory_type == LLInventoryType::IT_SNAPSHOT) ? ICONNAME_SNAPSHOT : ICONNAME_TEXTURE;
+			break;
+		case LLAssetType::AT_SOUND:
+			idx = ICONNAME_SOUND;
+			break;
+		case LLAssetType::AT_CALLINGCARD:
+			idx = (misc_flag != 0) ? ICONNAME_CALLINGCARD_ONLINE : ICONNAME_CALLINGCARD_OFFLINE;
+			break;
+		case LLAssetType::AT_LANDMARK:
+			idx = (misc_flag != 0) ? ICONNAME_LANDMARK_VISITED : ICONNAME_LANDMARK;
+			break;
+		case LLAssetType::AT_SCRIPT:
+		case LLAssetType::AT_LSL_TEXT:
+		case LLAssetType::AT_LSL_BYTECODE:
+			idx = ICONNAME_SCRIPT;
+			break;
+		case LLAssetType::AT_CLOTHING:
+		case LLAssetType::AT_BODYPART:
+			idx = assignWearableIcon(misc_flag);
+			break;
+		case LLAssetType::AT_NOTECARD:
+			idx = ICONNAME_NOTECARD;
+			break;
+		case LLAssetType::AT_ANIMATION:
+			idx = ICONNAME_ANIMATION;
+			break;
+		case LLAssetType::AT_GESTURE:
+			idx = ICONNAME_GESTURE;
+			break;
+		case LLAssetType::AT_LINK:
+			idx = ICONNAME_LINKITEM;
+			break;
+		case LLAssetType::AT_LINK_FOLDER:
+			idx = ICONNAME_LINKFOLDER;
+			break;
+		case LLAssetType::AT_OBJECT:
+			idx = ICONNAME_OBJECT;
+			break;
+		case LLAssetType::AT_MESH:
+			idx = ICONNAME_MESH;
+		default:
+			break;
+	}
+	
+	return getIconName(idx);
+}
+
+
+const std::string& LLInventoryIcon::getIconName(EIconName idx)
+{
+	const IconEntry *entry = LLIconDictionary::instance().lookup(idx);
+	return entry->mName;
+}
+
+LLInventoryIcon::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag)
+{
+	const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag);
+	return LLWearableType::getIconName(wearable_type);
+}
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h
new file mode 100644
index 000000000..0144acf52
--- /dev/null
+++ b/indra/newview/llinventoryicon.h
@@ -0,0 +1,102 @@
+/** 
+ * @file llinventoryfunctions.h
+ * @brief Miscellaneous inventory-related functions and classes
+ * class definition
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINVENTORYICON_H
+#define LL_LLINVENTORYICON_H
+
+#include "llassettype.h"
+#include "llinventorytype.h"
+#include "llui.h"
+
+class LLInventoryIcon
+{
+public:
+	enum EIconName
+	{
+		ICONNAME_TEXTURE,
+		ICONNAME_SOUND,
+		ICONNAME_CALLINGCARD_ONLINE,
+		ICONNAME_CALLINGCARD_OFFLINE,
+		ICONNAME_LANDMARK,
+		ICONNAME_LANDMARK_VISITED,
+		ICONNAME_SCRIPT,
+		ICONNAME_CLOTHING,
+		ICONNAME_OBJECT,
+		ICONNAME_OBJECT_MULTI,
+		ICONNAME_NOTECARD,
+		ICONNAME_BODYPART,
+		ICONNAME_SNAPSHOT,
+		
+		ICONNAME_BODYPART_SHAPE,
+		ICONNAME_BODYPART_SKIN,
+		ICONNAME_BODYPART_HAIR,
+		ICONNAME_BODYPART_EYES,
+		ICONNAME_CLOTHING_SHIRT,
+		ICONNAME_CLOTHING_PANTS,
+		ICONNAME_CLOTHING_SHOES,
+		ICONNAME_CLOTHING_SOCKS,
+		ICONNAME_CLOTHING_JACKET,
+		ICONNAME_CLOTHING_GLOVES,
+		ICONNAME_CLOTHING_UNDERSHIRT,
+		ICONNAME_CLOTHING_UNDERPANTS,
+		ICONNAME_CLOTHING_SKIRT,
+		ICONNAME_CLOTHING_ALPHA,
+		ICONNAME_CLOTHING_TATTOO,
+
+		ICONNAME_ANIMATION,
+		ICONNAME_GESTURE,
+
+		ICONNAME_CLOTHING_PHYSICS,
+		
+		ICONNAME_LINKITEM,
+		ICONNAME_LINKFOLDER,
+		ICONNAME_MESH,
+
+		ICONNAME_INVALID,
+		ICONNAME_COUNT,
+		ICONNAME_NONE = -1
+	};
+
+	static const std::string& getIconName(LLAssetType::EType asset_type,
+										  LLInventoryType::EType inventory_type = LLInventoryType::IT_NONE,
+										  U32 misc_flag = 0, // different meanings depending on item type
+										  BOOL item_is_multi = FALSE);
+	static const std::string& getIconName(EIconName idx);
+
+	static LLUIImagePtr getIcon(LLAssetType::EType asset_type,
+								LLInventoryType::EType inventory_type = LLInventoryType::IT_NONE,
+								U32 misc_flag = 0, // different meanings depending on item type
+								BOOL item_is_multi = FALSE);
+	static LLUIImagePtr getIcon(EIconName idx);
+
+protected:
+	static EIconName assignWearableIcon(U32 misc_flag);
+};
+#endif // LL_LLINVENTORYICON_H
+
+
+
diff --git a/indra/newview/llinventoryview.cpp b/indra/newview/llinventoryview.cpp
index 8edef568b..078fecb58 100644
--- a/indra/newview/llinventoryview.cpp
+++ b/indra/newview/llinventoryview.cpp
@@ -1432,147 +1432,6 @@ BOOL LLInventoryView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 	return handled;
 }
-std::string get_item_icon_name(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point,
-							 BOOL item_is_multi )
-{
-	EInventoryIcon idx = OBJECT_ICON_NAME;
-	if ( item_is_multi )
-	{
-		idx = OBJECT_MULTI_ICON_NAME;
-	}
-	
-	switch(asset_type)
-	{
-	case LLAssetType::AT_TEXTURE:
-		if(LLInventoryType::IT_SNAPSHOT == inventory_type)
-		{
-			idx = SNAPSHOT_ICON_NAME;
-		}
-		else
-		{
-			idx = TEXTURE_ICON_NAME;
-		}
-		break;
-
-	case LLAssetType::AT_SOUND:
-		idx = SOUND_ICON_NAME;
-		break;
-	case LLAssetType::AT_CALLINGCARD:
-		if(attachment_point!= 0)
-		{
-			idx = CALLINGCARD_ONLINE_ICON_NAME;
-		}
-		else
-		{
-			idx = CALLINGCARD_OFFLINE_ICON_NAME;
-		}
-		break;
-	case LLAssetType::AT_LANDMARK:
-		if(attachment_point!= 0)
-		{
-			idx = LANDMARK_VISITED_ICON_NAME;
-		}
-		else
-		{
-			idx = LANDMARK_ICON_NAME;
-		}
-		break;
-	case LLAssetType::AT_SCRIPT:
-	case LLAssetType::AT_LSL_TEXT:
-	case LLAssetType::AT_LSL_BYTECODE:
-		idx = SCRIPT_ICON_NAME;
-		break;
-	case LLAssetType::AT_CLOTHING:
-		idx = CLOTHING_ICON_NAME;
-	case LLAssetType::AT_BODYPART :
-		if(LLAssetType::AT_BODYPART == asset_type)
-		{
-			idx = BODYPART_ICON_NAME;
-		}
-		switch(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & attachment_point)
-		{
-		case LLWearableType::WT_SHAPE:
-			idx = BODYPART_SHAPE_ICON_NAME;
-			break;
-		case LLWearableType::WT_SKIN:
-			idx = BODYPART_SKIN_ICON_NAME;
-			break;
-		case LLWearableType::WT_HAIR:
-			idx = BODYPART_HAIR_ICON_NAME;
-			break;
-		case LLWearableType::WT_EYES:
-			idx = BODYPART_EYES_ICON_NAME;
-			break;
-		case LLWearableType::WT_SHIRT:
-			idx = CLOTHING_SHIRT_ICON_NAME;
-			break;
-		case LLWearableType::WT_PANTS:
-			idx = CLOTHING_PANTS_ICON_NAME;
-			break;
-		case LLWearableType::WT_SHOES:
-			idx = CLOTHING_SHOES_ICON_NAME;
-			break;
-		case LLWearableType::WT_SOCKS:
-			idx = CLOTHING_SOCKS_ICON_NAME;
-			break;
-		case LLWearableType::WT_JACKET:
-			idx = CLOTHING_JACKET_ICON_NAME;
-			break;
-		case LLWearableType::WT_GLOVES:
-			idx = CLOTHING_GLOVES_ICON_NAME;
-			break;
-		case LLWearableType::WT_UNDERSHIRT:
-			idx = CLOTHING_UNDERSHIRT_ICON_NAME;
-			break;
-		case LLWearableType::WT_UNDERPANTS:
-			idx = CLOTHING_UNDERPANTS_ICON_NAME;
-			break;
-		case LLWearableType::WT_SKIRT:
-			idx = CLOTHING_SKIRT_ICON_NAME;
-			break;
-		case LLWearableType::WT_ALPHA:
-			idx = CLOTHING_ALPHA_ICON_NAME;
-			break;
-		case LLWearableType::WT_TATTOO:
-			idx = CLOTHING_TATTOO_ICON_NAME;
-			break;
-		case LLWearableType::WT_PHYSICS:
-			idx = CLOTHING_PHYSICS_ICON_NAME;
-			break;
-		default:
-			// no-op, go with choice above
-			break;
-		}
-		break;
-	case LLAssetType::AT_NOTECARD:
-		idx = NOTECARD_ICON_NAME;
-		break;
-	case LLAssetType::AT_ANIMATION:
-		idx = ANIMATION_ICON_NAME;
-		break;
-	case LLAssetType::AT_GESTURE:
-		idx = GESTURE_ICON_NAME;
-		break;
-	case LLAssetType::AT_MESH:
-		idx = MESH_ICON_NAME;
-		break;
-	default:
-		break;
-	}
-	
-	return ICON_NAME[idx];
-}
-
-LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point,
-							 BOOL item_is_multi)
-{
-	const std::string& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
-	return LLUI::getUIImage(icon_name);
-}
 
 const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder");
 const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("RecentItemsSortOrder");
diff --git a/indra/newview/llinventoryview.h b/indra/newview/llinventoryview.h
index 492e79d33..285062468 100644
--- a/indra/newview/llinventoryview.h
+++ b/indra/newview/llinventoryview.h
@@ -384,24 +384,6 @@ void open_notecard(LLViewerInventoryItem* inv_item, const std::string& title, co
 void open_landmark(LLViewerInventoryItem* inv_item, const std::string& title,                          BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 void open_texture(const LLUUID& item_id, const std::string& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 
-std::string get_item_icon_name(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-// Move items from an in-world object's "Contents" folder to a specified
-// folder in agent inventory.
-BOOL move_inv_category_world_to_agent(const LLUUID& object_id, 
-									  const LLUUID& category_id,
-									  BOOL drop,
-									  void (*callback)(S32, void*) = NULL,
-									  void* user_data = NULL);
-
 const BOOL TAKE_FOCUS_YES = TRUE;
 const BOOL TAKE_FOCUS_NO  = FALSE;
 
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 48115837a..36bd9b809 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -40,7 +40,7 @@
 #include "llviewerinventory.h"
 #include "llinventorymodel.h"
 #include "llinventorydefines.h"
-#include "llinventoryview.h"
+#include "llinventoryicon.h"
 #include "llagent.h"
 #include "lltooldraganddrop.h"
 
@@ -311,7 +311,7 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item)
 		item_is_multi = TRUE;
 	};
 
-	std::string icon_name = get_item_icon_name(inv_item->getType(),
+	std::string icon_name = LLInventoryIcon::getIconName(inv_item->getType(),
 										inv_item->getInventoryType(),
 										inv_item->getFlags(),
 										item_is_multi );
@@ -469,7 +469,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 		row["columns"][0]["column"] = "icon";
 		if (has_attachment)
 		{
-			std::string icon_name = get_item_icon_name(
+			std::string icon_name = LLInventoryIcon::getIconName(
 									(LLAssetType::EType)asset_type,
 									LLInventoryType::IT_NONE,FALSE, FALSE);
 			row["columns"][0]["type"] = "icon";
@@ -544,7 +544,7 @@ void LLPanelGroupNotices::showNotice(const std::string& subject,
 	{
 		mInventoryOffer = inventory_offer;
 
-		std::string icon_name = get_item_icon_name(mInventoryOffer->mType,
+		std::string icon_name = LLInventoryIcon::getIconName(mInventoryOffer->mType,
 												LLInventoryType::IT_TEXTURE,
 												0, FALSE);
 
diff --git a/indra/newview/llpanelinventory.cpp b/indra/newview/llpanelinventory.cpp
index a39ee10db..bfb4ca1d1 100644
--- a/indra/newview/llpanelinventory.cpp
+++ b/indra/newview/llpanelinventory.cpp
@@ -50,7 +50,9 @@
 #include "llfontgl.h"
 #include "llassetstorage.h"
 #include "llinventory.h"
+#include "llinventorybridge.h"
 #include "llinventorydefines.h"
+#include "llinventoryicon.h"
 #include "llnotificationsutil.h"
 
 #include "llagent.h"
@@ -61,7 +63,8 @@
 #include "llfolderview.h"
 #include "llgl.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llinventoryicon.h"
+#include "llinventorybridge.h"
 #include "llmenugl.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
@@ -361,7 +364,7 @@ LLUIImagePtr LLTaskInvFVBridge::getIcon() const
 		item_is_multi = TRUE;
 	}
 
-	return get_item_icon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi );
+	return LLInventoryIcon::getIcon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi );
 }
 
 void LLTaskInvFVBridge::openItem()
@@ -1002,7 +1005,7 @@ LLTaskTextureBridge::LLTaskTextureBridge(
 
 LLUIImagePtr LLTaskTextureBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_TEXTURE, mInventoryType, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_TEXTURE, mInventoryType, 0, FALSE);
 }
 
 void LLTaskTextureBridge::openItem()
@@ -1062,7 +1065,7 @@ LLTaskSoundBridge::LLTaskSoundBridge(
 
 LLUIImagePtr LLTaskSoundBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);
 }
 
 void LLTaskSoundBridge::openItem()
@@ -1196,7 +1199,7 @@ LLTaskLandmarkBridge::LLTaskLandmarkBridge(
 
 LLUIImagePtr LLTaskLandmarkBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);
 }
 
 
@@ -1227,7 +1230,7 @@ LLTaskCallingCardBridge::LLTaskCallingCardBridge(
 
 LLUIImagePtr LLTaskCallingCardBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, 0, FALSE);
 }
 
 BOOL LLTaskCallingCardBridge::isItemRenameable() const
@@ -1267,7 +1270,7 @@ LLTaskScriptBridge::LLTaskScriptBridge(
 
 LLUIImagePtr LLTaskScriptBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
 }
 
 
@@ -1381,7 +1384,7 @@ LLUIImagePtr LLTaskObjectBridge::getIcon() const
 		item_is_multi = TRUE;
 	}
 
-	return get_item_icon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi);
 }
 
 ///----------------------------------------------------------------------------
@@ -1411,7 +1414,7 @@ LLTaskNotecardBridge::LLTaskNotecardBridge(
 
 LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
 }
 
 void LLTaskNotecardBridge::openItem()
@@ -1485,7 +1488,7 @@ LLTaskGestureBridge::LLTaskGestureBridge(
 
 LLUIImagePtr LLTaskGestureBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);
 }
 
 void LLTaskGestureBridge::openItem()
@@ -1545,7 +1548,7 @@ LLTaskAnimationBridge::LLTaskAnimationBridge(
 
 LLUIImagePtr LLTaskAnimationBridge::getIcon() const
 {
-	return get_item_icon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);
+	return LLInventoryIcon::getIcon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);
 }
 
 void LLTaskAnimationBridge::openItem()
@@ -1629,7 +1632,7 @@ LLTaskWearableBridge::LLTaskWearableBridge(
 
 LLUIImagePtr LLTaskWearableBridge::getIcon() const
 {
-	return get_item_icon(mAssetType, LLInventoryType::IT_WEARABLE, mFlags, FALSE );
+	return LLInventoryIcon::getIcon(mAssetType, LLInventoryType::IT_WEARABLE, mFlags, FALSE );
 }
 
 
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp
index 602c4b1de..ee6e534d2 100644
--- a/indra/newview/lltexlayerparams.cpp
+++ b/indra/newview/lltexlayerparams.cpp
@@ -237,7 +237,7 @@ BOOL LLTexLayerParamAlpha::getSkip() const
 	}
 
 	LLWearableType::EType type = (LLWearableType::EType)getWearableType();
-	if ((type != WT_INVALID) && !avatar->isWearingWearableType(type))
+	if ((type != LLWearableType::WT_INVALID) && !avatar->isWearingWearableType(type))
 	{
 		return TRUE;
 	}
diff --git a/indra/newview/llwearabletype.cpp b/indra/newview/llwearabletype.cpp
index 44c1d1e93..18507f262 100644
--- a/indra/newview/llwearabletype.cpp
+++ b/indra/newview/llwearabletype.cpp
@@ -32,17 +32,26 @@ struct WearableEntry : public LLDictionaryEntry
 {
 	WearableEntry(const std::string &name,
 				  const std::string& default_new_name,
-				  LLAssetType::EType assetType) :
+				  LLAssetType::EType assetType,
+				  LLInventoryIcon::EIconName iconName,
+				  BOOL disable_camera_switch = FALSE,
+				  BOOL allow_multiwear = TRUE) :
 		LLDictionaryEntry(name),
 		mAssetType(assetType),
 		mDefaultNewName(default_new_name),
-		mLabel(/*(LLTrans::getString*/(name))
+		mLabel(/*LLTrans::getString*/(name)),
+		mIconName(iconName),
+		mDisableCameraSwitch(disable_camera_switch),
+		mAllowMultiwear(allow_multiwear)
 	{
 		
 	}
 	const LLAssetType::EType mAssetType;
 	const std::string mLabel;
 	const std::string mDefaultNewName; //keep mLabel for backward compatibility
+	LLInventoryIcon::EIconName mIconName;
+	BOOL mDisableCameraSwitch;
+	BOOL mAllowMultiwear;
 };
 
 class LLWearableDictionary : public LLSingleton<LLWearableDictionary>,
@@ -54,26 +63,26 @@ public:
 
 LLWearableDictionary::LLWearableDictionary()
 {
-	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry("shape",       "New Shape",			LLAssetType::AT_BODYPART));
-	addEntry(LLWearableType::WT_SKIN,         new WearableEntry("skin",        "New Skin",			LLAssetType::AT_BODYPART));
-	addEntry(LLWearableType::WT_HAIR,         new WearableEntry("hair",        "New Hair",			LLAssetType::AT_BODYPART));
-	addEntry(LLWearableType::WT_EYES,         new WearableEntry("eyes",        "New Eyes",			LLAssetType::AT_BODYPART));
-	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry("shirt",       "New Shirt",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_PANTS,        new WearableEntry("pants",       "New Pants",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_SHOES,        new WearableEntry("shoes",       "New Shoes",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry("socks",       "New Socks",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_JACKET,       new WearableEntry("jacket",      "New Jacket",		LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry("gloves",      "New Gloves",		LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry("undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry("underpants",  "New Underpants",	LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry("skirt",       "New Skirt",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry("alpha",       "New Alpha",			LLAssetType::AT_CLOTHING));
-	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry("tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING));
+	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry("shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SHAPE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SKIN,         new WearableEntry("skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SKIN, FALSE, FALSE));
+	addEntry(LLWearableType::WT_HAIR,         new WearableEntry("hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_HAIR, FALSE, FALSE));
+	addEntry(LLWearableType::WT_EYES,         new WearableEntry("eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_EYES, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry("shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_PANTS,        new WearableEntry("pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_PANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SHOES,        new WearableEntry("shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHOES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry("socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SOCKS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_JACKET,       new WearableEntry("jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_JACKET, FALSE, TRUE));
+	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry("gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_GLOVES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry("undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERSHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry("underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERPANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry("skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry("alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
+	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry("tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
 
-	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING));
+	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
 
-	addEntry(LLWearableType::WT_INVALID,      new WearableEntry("invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE));
-	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry("none",        "Invalid Wearable", 	LLAssetType::AT_NONE));
+	addEntry(LLWearableType::WT_INVALID,      new WearableEntry("invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry("none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE, FALSE, FALSE));
 }
 
 // static
@@ -120,3 +129,30 @@ LLAssetType::EType LLWearableType::getAssetType(LLWearableType::EType type)
 	return entry->mAssetType;
 }
 
+// static 
+LLInventoryIcon::EIconName LLWearableType::getIconName(LLWearableType::EType type)
+{
+	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
+	const WearableEntry *entry = dict->lookup(type);
+	if (!entry) return getIconName(WT_INVALID);
+	return entry->mIconName;
+} 
+
+// static 
+BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type)
+{
+	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
+	const WearableEntry *entry = dict->lookup(type);
+	if (!entry) return FALSE;
+	return entry->mDisableCameraSwitch;
+}
+
+// static 
+BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type)
+{
+	return false; //Disabled
+	/*const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
+	const WearableEntry *entry = dict->lookup(type);
+	if (!entry) return FALSE;
+	return entry->mAllowMultiwear;*/
+}
diff --git a/indra/newview/llwearabletype.h b/indra/newview/llwearabletype.h
index 602fae71d..6e6115b69 100644
--- a/indra/newview/llwearabletype.h
+++ b/indra/newview/llwearabletype.h
@@ -29,6 +29,7 @@
 
 #include "llassettype.h"
 #include "lldictionary.h"
+#include "llinventoryicon.h"
 #include "llsingleton.h"
 
 class LLWearableType
@@ -63,6 +64,9 @@ public:
 	static const std::string& 			getTypeLabel(EType type);
 	static LLAssetType::EType 			getAssetType(EType type);
 	static EType 						typeNameToType(const std::string& type_name);
+	static LLInventoryIcon::EIconName 	getIconName(EType type);
+	static BOOL 						getDisableCameraSwitch(EType type);
+	static BOOL 						getAllowMultiwear(EType type);
 
 protected:
 	LLWearableType() {}

From 4368c572438d5dd24615b93c596b1e2e8d9c093d Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 19 Oct 2011 09:43:28 -0500
Subject: [PATCH 22/23] Disabled reserved attrib having reserved locations in
 shaders. Conflicted with attrib location assumptions elsewhere.

---
 indra/llrender/llglslshader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 5645c9061..6647a3390 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -262,11 +262,11 @@ void LLGLSLShader::attachObjects(GLhandleARB* objects, S32 count)
 BOOL LLGLSLShader::mapAttributes(const vector<string> * attributes)
 {
 	//before linking, make sure reserved attributes always have consistent locations
-	for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++)
+	/*for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++)
 	{
 		const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str();
 		glBindAttribLocationARB(mProgramObject, i, (const GLcharARB *) name);
-	}
+	}*/
 	
 	//link the program
 	BOOL res = link();

From 5d6aadb2680595a938223a0a6ec38817c334c571 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 19 Oct 2011 09:53:44 -0500
Subject: [PATCH 23/23] Prevent estimated vram value from being clobbered if
 glGetIntegerv memory query returns something too small.

---
 indra/llrender/llgl.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 712582540..48fea8e87 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -545,6 +545,8 @@ bool LLGLManager::initGL()
 	// This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture.
 	initExtensions();
 
+	S32 old_vram = mVRAM;
+
 	if (mHasATIMemInfo)
 	{ //ask the gl how much vram is free at startup and attempt to use no more than half of that
 		S32 meminfo[4];
@@ -559,6 +561,16 @@ bool LLGLManager::initGL()
 		mVRAM = dedicated_memory/1024;
 	}
 
+	if (mVRAM < 256)
+	{ //something likely went wrong using the above extensions, fall back to old method
+		mVRAM = old_vram;
+	}
+	if (mHasFragmentShader)
+	{
+		GLint num_tex_image_units;
+		glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &num_tex_image_units);
+		mNumTextureImageUnits = llmin(num_tex_image_units, 32);
+	}
 	if (mHasMultitexture)
 	{
 		GLint num_tex_units;		
@@ -578,12 +590,6 @@ bool LLGLManager::initGL()
 		return false;
 	}
 	
-	if (mHasFragmentShader)
-	{
-		GLint num_tex_image_units;
-		glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &num_tex_image_units);
-		mNumTextureImageUnits = llmin(num_tex_image_units, 32);
-	}
 
 	if (mHasTextureMultisample)
 	{
@@ -1314,9 +1320,6 @@ void LLGLState::initClass()
 	sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE;
 	glDisable(GL_MULTISAMPLE_ARB);
 
-	sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE;
-	glDisable(GL_MULTISAMPLE_ARB);
-
 	glEnableClientState(GL_VERTEX_ARRAY);
 }