From e04752c165900e652f4b8a8a62c1f351967847d7 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Jan 2010 11:53:03 -0800
Subject: EXT-3874 	 Lindens can (appear to) be blocked from avatar info
 popup

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

(limited to 'indra')

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 72994a4371..6cb3431419 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -520,7 +520,10 @@ void LLInspectAvatar::updateVolumeSlider()
 	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
 
 	LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
-	mute_btn->setEnabled( voice_enabled );
+
+	bool is_linden = LLStringUtil::endsWith(mAvatarName, " Linden");
+
+	mute_btn->setEnabled( voice_enabled && !is_linden);
 	mute_btn->setValue( is_muted );
 
 	LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
-- 
cgit v1.2.3


From 8ac21358198c7eca0161ea38e6ce54a1e4dea6c2 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Jan 2010 15:31:47 -0800
Subject: EXT-3615 	 Tiny cosmetic thing: make sure all "Ok" in buttons
 are changed to "OK"

---
 indra/newview/skins/default/xui/en/floater_bulk_perms.xml   | 2 +-
 indra/newview/skins/default/xui/en/floater_color_picker.xml | 4 ++--
 indra/newview/skins/default/xui/en/floater_mute_object.xml  | 2 +-
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 4 ++--
 indra/newview/skins/default/xui/en/notifications.xml        | 8 ++++----
 indra/newview/skins/default/xui/en/panel_group_notify.xml   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 53ae24fe3f..d007ceff98 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -287,7 +287,7 @@
     <button
      follows="left|top"
      height="23"
-     label="Ok"
+     label="OK"
      layout="topleft"
      left="65"
      name="apply"
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index 4380ff8f4b..fbecebc363 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -186,8 +186,8 @@
     <button
      follows="right|bottom"
      height="20"
-     label="Ok"
-     label_selected="Ok"
+     label="OK"
+     label_selected="OK"
      layout="topleft"
      right="-120"
      top_delta="9"
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 454b1c43b2..22b0a1783f 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -47,7 +47,7 @@
     <button
      follows="bottom|left"
      height="23"
-     label="Ok"
+     label="OK"
      layout="topleft"
      left="155"
      name="OK"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 695021f755..cad7d72ed7 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -131,8 +131,8 @@
          <button
      follows="right|bottom"
      height="20"
-     label="Ok"
-     label_selected="Ok"
+     label="OK"
+     label_selected="OK"
      layout="topleft"
      right="-120"
      name="Select"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d5f0bedb0..410c398ea5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -157,7 +157,7 @@ No tutorial is currently available.
  An error occurred while updating [APP_NAME].  Please [http://get.secondlife.com download the latest version] of the Viewer.
     <usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -169,7 +169,7 @@ Could not connect to the [SECOND_LIFE_GRID].
 Make sure your Internet connection is working properly.
 	<usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -179,7 +179,7 @@ Make sure your Internet connection is working properly.
 Message Template [PATH] not found.
 	<usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -5793,7 +5793,7 @@ Are you sure you want to close all IMs?
     <usetemplate
      name="okcancelignore"
      notext="Cancel"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification icon="notifytip.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 9b0b81cd0a..65b2e81d50 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -93,7 +93,7 @@
      bottom="85"
      follows="bottom"
      height="20"
-     label="Ok"
+     label="OK"
      layout="topleft"
      right="-10"
      name="btn_ok"
-- 
cgit v1.2.3


From ecf6e997ff0b081c41d7b3685c875f2f181ef55f Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Jan 2010 16:15:15 -0800
Subject: EXT-3874 	 Lindens can (appear to) be blocked from avatar info
 popup

---
 indra/newview/llinspectavatar.cpp | 75 +++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 31 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 6cb3431419..5f9d479b3e 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -403,7 +403,8 @@ void LLInspectAvatar::updateModeratorPanel()
 {
 	bool enable_moderator_panel = false;
 
-    if (LLVoiceChannel::getCurrentVoiceChannel())
+    if (LLVoiceChannel::getCurrentVoiceChannel() &&
+		mAvatarID != gAgent.getID())
     {
 		LLUUID session_id = LLVoiceChannel::getCurrentVoiceChannel()->getSessionID();
 
@@ -514,45 +515,57 @@ void LLInspectAvatar::toggleSelectedVoice(bool enabled)
 
 void LLInspectAvatar::updateVolumeSlider()
 {
-	// By convention, we only display and toggle voice mutes, not all mutes
-	bool is_muted = LLMuteList::getInstance()->
-						isMuted(mAvatarID, LLMute::flagVoiceChat);
-	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
-
-	LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
 
-	bool is_linden = LLStringUtil::endsWith(mAvatarName, " Linden");
-
-	mute_btn->setEnabled( voice_enabled && !is_linden);
-	mute_btn->setValue( is_muted );
+	bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
 
-	LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
-	volume_slider->setEnabled( voice_enabled && !is_muted );
-	const F32 DEFAULT_VOLUME = 0.5f;
-	F32 volume;
-	if (is_muted)
+	// Do not display volume slider and mute button if it 
+	// is ourself or we are not in a voice channel together
+	if (!voice_enabled || (mAvatarID == gAgent.getID()))
 	{
-		// it's clearer to display their volume as zero
-		volume = 0.f;
+		getChild<LLUICtrl>("mute_btn")->setVisible(false);
+		getChild<LLUICtrl>("volume_slider")->setVisible(false);
 	}
-	else if (!voice_enabled)
-	{
-		// use nominal value rather than 0
-		volume = DEFAULT_VOLUME;
-	}
-	else
+
+	else 
 	{
-		// actual volume
-		volume = gVoiceClient->getUserVolume(mAvatarID);
+		getChild<LLUICtrl>("mute_btn")->setVisible(true);
+		getChild<LLUICtrl>("volume_slider")->setVisible(true);
+
+		// By convention, we only display and toggle voice mutes, not all mutes
+		bool is_muted = LLMuteList::getInstance()->
+							isMuted(mAvatarID, LLMute::flagVoiceChat);
+
+		LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
 
-		// *HACK: Voice client doesn't have any data until user actually
-		// says something.
-		if (volume == 0.f)
+		bool is_linden = LLStringUtil::endsWith(mAvatarName, " Linden");
+
+		mute_btn->setEnabled( !is_linden);
+		mute_btn->setValue( is_muted );
+
+		LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
+		volume_slider->setEnabled( !is_muted );
+		const F32 DEFAULT_VOLUME = 0.5f;
+		F32 volume;
+		if (is_muted)
+		{
+			// it's clearer to display their volume as zero
+			volume = 0.f;
+		}
+		else
 		{
-			volume = DEFAULT_VOLUME;
+			// actual volume
+			volume = gVoiceClient->getUserVolume(mAvatarID);
+
+			// *HACK: Voice client doesn't have any data until user actually
+			// says something.
+			if (volume == 0.f)
+			{
+				volume = DEFAULT_VOLUME;
+			}
 		}
+		volume_slider->setValue( (F64)volume );
 	}
-	volume_slider->setValue( (F64)volume );
+
 }
 
 void LLInspectAvatar::onClickMuteVolume()
-- 
cgit v1.2.3


From 3a578884e7b012a3635d5405ffe5766818b616fd Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Jan 2010 16:15:30 -0800
Subject: EXT-3091 	 [BSI] Loading Texture Text in Build doesn't fit

---
 indra/newview/lltexturectrl.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 25e5e23e6f..a5ddb0a620 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1242,11 +1242,11 @@ void LLTextureCtrl::draw()
 		 (mTexturep->getDiscardLevel() != 1) &&
 		 (mTexturep->getDiscardLevel() != 0))
 	{
-		LLFontGL* font = LLFontGL::getFontSansSerifBig();
+		LLFontGL* font = LLFontGL::getFontSansSerif();
 		font->renderUTF8(
 			mLoadingPlaceholderString, 0,
-			llfloor(interior.mLeft+10), 
-			llfloor(interior.mTop-20),
+			llfloor(interior.mLeft+3), 
+			llfloor(interior.mTop-25),
 			LLColor4::white,
 			LLFontGL::LEFT,
 			LLFontGL::BASELINE,
-- 
cgit v1.2.3


From 55aba555f518e73cf90e22623f32ac4e52a0b723 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Jan 2010 16:15:48 -0800
Subject: EXT-3418 	 [BSI] Can't set Web Proxy in Preferences floater

---
 .../default/xui/en/panel_preferences_setup.xml     | 51 ++++++++++++----------
 1 file changed, 28 insertions(+), 23 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 34bd6fb091..2c60271801 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -134,20 +134,20 @@
 		 parameter="ChangeConnectionPort" />
     </check_box>
     <spinner
-     control_name="BrowserProxyPort"
-     enabled_control="BrowserProxyEnabled"
+     control_name="ConnectionPort"
+     enabled_control="ConnectionPortEnabled"
 	 decimal_digits="0"
      follows="left|top"
      height="23"
      increment="1"
-     initial_value="80"
+     initial_value="13000"
      label="Port number:"
      label_width="75"
      layout="topleft"
      left_delta="160"
-     max_val="12000"
-     min_val="10"
-     name="web_proxy_port"
+     max_val="13050"
+     min_val="13000"
+     name="connection_port"
      top_delta="-2"
      width="140" />
     <text
@@ -296,7 +296,8 @@
      follows="left|top"
      height="16"
      initial_value="false"
-     label="Web proxy"
+     control_name="BrowserProxyEnabled" 
+     label="Enable Web Proxy"
      left_delta="0"
      mouse_opaque="true"
      name="web_proxy_enabled"
@@ -314,30 +315,34 @@
      tool_tip="The name or IP address of the proxy you would like to use"
      top_pad="4"
      width="200" />
-    <button
-     follows="left|top"
-     height="23"
-     enabled="false"
-     label="Browse"
-     label_selected="Browse"
-     layout="topleft"
-     left_pad="5"
-     name="set_proxy"
-     top_pad="-21"
-     width="100">
-        <button.commit_callback
-         function="Pref.SetCache" />
-    </button>
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left_delta="-203"
+     left_delta="0"
      name="Proxy location"
      top_delta="20"
      width="300"
      text_color="LtGray_50">
         Proxy location
-    </text></panel>
+    </text>
+  <spinner
+     control_name="BrowserProxyPort"
+     enabled_control="BrowserProxyEnabled"
+	 decimal_digits="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="80"
+     label="Port number:"
+     label_width="75"
+     layout="topleft"
+     left_delta="230"
+     max_val="12000"
+     min_val="10"
+     name="web_proxy_port"
+     top_delta="-20"
+     width="140" />
+</panel>
-- 
cgit v1.2.3


From 9ffaacc47e8d6d48158adb1b99728c876a6da2ee Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 8 Jan 2010 17:26:47 -0800
Subject: First pass expose inventory item settings in XML
 (folder_view_item.xml) Optimized LLFolderViewItem constructor by passing
 param block as const ref to avoid copies. Removed per-item arrow and
 background images, use defaults. Removed unneeded static image pointers.
 Removed hard-coded rounded_square.tga, replaced with Rounded_Square Ditto for
 folder_arrow.tga Reviewed with Richard.

---
 indra/llui/llconsole.cpp                           |  2 +-
 indra/llui/llmultislider.cpp                       |  2 +-
 indra/llui/llscrolllistcell.cpp                    |  2 +-
 indra/newview/app_settings/settings.xml            | 11 ----
 indra/newview/llfasttimerview.cpp                  |  2 +-
 indra/newview/llfolderview.cpp                     | 10 +--
 indra/newview/llfolderviewitem.cpp                 | 73 +++++++++++-----------
 indra/newview/llfolderviewitem.h                   | 14 ++---
 indra/newview/llhudtext.cpp                        |  2 +-
 indra/newview/llmanip.cpp                          |  2 +-
 indra/newview/skins/default/textures/textures.xml  |  3 +-
 .../default/xui/en/panel_preferences_graphics1.xml |  8 +--
 .../skins/default/xui/en/panel_progress.xml        |  2 +-
 .../default/xui/en/widgets/folder_view_item.xml    |  8 +++
 14 files changed, 71 insertions(+), 70 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/folder_view_item.xml

(limited to 'indra')

diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index e08d93b232..59499f987b 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -180,7 +180,7 @@ void LLConsole::draw()
 	// draw remaining lines
 	F32 y_pos = 0.f;
 
-	LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
+	LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square");
 
 //	F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
 	F32 console_opacity = llclamp(LLUI::sSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index aea7c5f87c..27a727fdf5 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -490,7 +490,7 @@ void LLMultiSlider::draw()
 	F32 opacity = getEnabled() ? 1.f : 0.3f;
 
 	// Track
-	LLUIImagePtr thumb_imagep = LLUI::getUIImage("rounded_square.tga");
+	LLUIImagePtr thumb_imagep = LLUI::getUIImage("Rounded_Square");
 
 	static LLUICachedControl<S32> multi_track_height ("UIMultiTrackHeight", 0);
 	S32 height_offset = (getRect().getHeight() - multi_track_height) / 2;
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 7238d903a3..3cc92baa8d 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -188,7 +188,7 @@ LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p)
 	// initialize rounded rect image
 	if (!mRoundedRectImage)
 	{
-		mRoundedRectImage = LLUI::getUIImage("rounded_square.tga");
+		mRoundedRectImage = LLUI::getUIImage("Rounded_Square");
 	}
 }
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7d98a4b6ce..382793a497 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3257,17 +3257,6 @@
       <key>Value</key>
       <real>0.75</real>
     </map>
-    <key>FolderIndentation</key>
-    <map>
-      <key>Comment</key>
-      <string>Number of pixels to indent subfolders in inventory</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>8</integer>
-    </map>
     <key>FolderLoadingMessageWaitTime</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 7d8bb6e104..4fa97e789b 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -314,7 +314,7 @@ void LLFastTimerView::draw()
 	S32 left, top, right, bottom;
 	S32 x, y, barw, barh, dx, dy;
 	S32 texth, textw;
-	LLPointer<LLUIImage> box_imagep = LLUI::getUIImage("rounded_square.tga");
+	LLPointer<LLUIImage> box_imagep = LLUI::getUIImage("Rounded_Square");
 
 	// Draw the window background
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 41f4d1a663..1ab111a41d 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -206,7 +206,9 @@ LLFolderView::LLFolderView(const Params& p)
 	mAutoOpenCandidate = NULL;
 	mAutoOpenTimer.stop();
 	mKeyboardSelection = FALSE;
-    static LLUICachedControl<S32> indentation("FolderIndentation", 0);
+	const LLFolderViewItem::Params& item_params =
+		LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
+	S32 indentation = item_params.folder_indentation();
 	mIndentation = -indentation; // children start at indentation 0
 	gIdleCallbacks.addFunction(idle, this);
 
@@ -395,7 +397,7 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
 		getRoot()->getFilter()->getShowFolderState();
 
 	S32 total_width = LEFT_PAD;
-	S32 running_height = mDebugFilters ? llceil(sSmallFont->getLineHeight()) : 0;
+	S32 running_height = mDebugFilters ? llceil(LLFontGL::getFontMonospace()->getLineHeight()) : 0;
 	S32 target_height = running_height;
 	S32 parent_item_height = getRect().getHeight();
 
@@ -866,8 +868,8 @@ void LLFolderView::draw()
 	{
 		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
 										mFilter->getCurrentGeneration(), mFilter->getMinRequiredGeneration(), mFilter->getMustPassGeneration());
-		sSmallFont->renderUTF8(current_filter_string, 0, 2, 
-			getRect().getHeight() - sSmallFont->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f), 
+		LLFontGL::getFontMonospace()->renderUTF8(current_filter_string, 0, 2, 
+			getRect().getHeight() - LLFontGL::getFontMonospace()->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f), 
 			LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
 	}
 
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 9d54aafd67..41ceb5972e 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -51,11 +51,10 @@
 /// Class LLFolderViewItem
 ///----------------------------------------------------------------------------
 
+static LLDefaultChildRegistry::Register<LLFolderViewItem> r("folder_view_item");
+
 // statics 
 std::map<U8, LLFontGL*> LLFolderViewItem::sFonts; // map of styles to fonts
-const LLFontGL* LLFolderViewItem::sSmallFont = NULL;
-LLUIImagePtr LLFolderViewItem::sArrowImage;
-LLUIImagePtr LLFolderViewItem::sBoxImage;
 
 // only integers can be initialized in header
 const F32 LLFolderViewItem::FOLDER_CLOSE_TIME_CONSTANT = 0.02f;
@@ -84,33 +83,34 @@ LLFontGL* LLFolderViewItem::getLabelFontForStyle(U8 style)
 //static
 void LLFolderViewItem::initClass()
 {
-	sSmallFont = LLFontGL::getFontMonospace();
-	sArrowImage = LLUI::getUIImage("folder_arrow.tga"); 
-	sBoxImage = LLUI::getUIImage("rounded_square.tga");
 }
 
 //static
 void LLFolderViewItem::cleanupClass()
 {
 	sFonts.clear();
-	sArrowImage = NULL;
-	sBoxImage = NULL;
 }
 
 
 // NOTE: Optimize this, we call it a *lot* when opening a large inventory
 LLFolderViewItem::Params::Params()
-:	icon("icon"),
-	folder_arrow_image("folder_arrow_image", LLUI::getUIImage("folder_arrow.tga")),
-	selection_image("selection_image", LLUI::getUIImage("rounded_square.tga"))
+:	icon(),
+	icon_open(),
+	root(),
+	listener(),
+	folder_arrow_image("folder_arrow_image"),
+	folder_indentation("folder_indentation"),
+	selection_image("selection_image"),
+	font("font"),
+	item_height("item_height"),
+	creation_date()
 {
 	mouse_opaque(true);
 	follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP|FOLLOWS_RIGHT);
-	// JAMESDEBUG tab_stop(false);
 }
 
 // Default constructor
-LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
+LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 :	LLView(p),
 	mLabelWidth(0),
 	mLabelWidthDirty(false),
@@ -121,6 +121,7 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
 	mLabelStyle( LLFontGL::NORMAL ),
 	mHasVisibleChildren(FALSE),
 	mIndentation(0),
+	mItemHeight(p.item_height),
 	mNumDescendantsSelected(0),
 	mPassedFilter(FALSE),
 	mLastFilterGeneration(-1),
@@ -134,8 +135,6 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
 	mIcon(p.icon),
 	mIconOpen(p.icon_open),
 	mListener(p.listener),
-	mArrowImage(p.folder_arrow_image),
-	mBoxImage(p.selection_image),
 	mHidden(false),
 	mShowLoadStatus(false)
 {
@@ -392,10 +391,11 @@ BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* roo
 // makes sure that this view and it's children are the right size.
 S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
 {
-    static LLUICachedControl<S32> indentation("FolderIndentation", 0);
+	const Params& p = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
+	S32 indentation = p.folder_indentation();
+	// Only indent deeper items in hierarchy
 	mIndentation = (getParentFolder() 
-					&& getParentFolder()->getParentFolder() 
-					&& getParentFolder()->getParentFolder()->getParentFolder())
+					&& getParentFolder()->getParentFolder() )
 		? mParentFolder->getIndentation() + indentation
 		: 0;
 	if (mLabelWidthDirty)
@@ -421,9 +421,10 @@ S32 LLFolderViewItem::getItemHeight()
 {
 	if (mHidden) return 0;
 
-	S32 icon_height = mIcon->getHeight();
-	S32 label_height = llround(getLabelFontForStyle(mLabelStyle)->getLineHeight());
-	return llmax( icon_height, label_height ) + ICON_PAD;
+	//S32 icon_height = mIcon->getHeight();
+	//S32 label_height = llround(getLabelFontForStyle(mLabelStyle)->getLineHeight());
+	//return llmax( icon_height, label_height ) + ICON_PAD;
+	return mItemHeight;
 }
 
 void LLFolderViewItem::filter( LLInventoryFilter& filter)
@@ -834,6 +835,8 @@ void LLFolderViewItem::draw()
 	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
 	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 
+	const Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
+
 	bool possibly_has_children = false;
 	bool up_to_date = mListener && mListener->isUpToDate();
 	if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
@@ -843,11 +846,9 @@ void LLFolderViewItem::draw()
 	}
 	if(/*mControlLabel[0] != '\0' && */possibly_has_children)
 	{
-		if (sArrowImage)
-		{
-			gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
-				ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, sArrowImage->getImage(), sFgColor);
-		}
+		LLUIImage* arrow_image = default_params.folder_arrow_image;
+		gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
+			ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, arrow_image->getImage(), sFgColor);
 	}
 
 	F32 text_left = (F32)(ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation);
@@ -885,7 +886,7 @@ void LLFolderViewItem::draw()
 			0, 
 			getRect().getHeight(), 
 			getRect().getWidth() - 2,
-			llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD),
+			llfloor(getRect().getHeight() - mItemHeight),
 			bg_color, filled);
 		if (mIsCurSelection)
 		{
@@ -893,14 +894,14 @@ void LLFolderViewItem::draw()
 				0, 
 				getRect().getHeight(), 
 				getRect().getWidth() - 2,
-				llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD),
+				llfloor(getRect().getHeight() - mItemHeight),
 				sHighlightFgColor, FALSE);
 		}
-		if (getRect().getHeight() > llround(font->getLineHeight()) + ICON_PAD + 4)
+		if (getRect().getHeight() > mItemHeight + 4)
 		{
 			gl_rect_2d(
 				0, 
-				llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD) - 4, 
+				llfloor(getRect().getHeight() - mItemHeight) - 4, 
 				getRect().getWidth() - 2,
 				2,
 				sHighlightFgColor, FALSE);
@@ -908,7 +909,7 @@ void LLFolderViewItem::draw()
 			{
 				gl_rect_2d(
 					0, 
-					llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD) - 4, 
+					llfloor(getRect().getHeight() - mItemHeight) - 4, 
 					getRect().getWidth() - 2,
 					2,
 					sHighlightBgColor, TRUE);
@@ -963,7 +964,8 @@ void LLFolderViewItem::draw()
 			}
 
 			LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
-			sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
+			LLFontGL::getFontMonospace()->renderUTF8(
+				mStatusText, 0, text_left, y, filter_color,
 				LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
 				S32_MAX, S32_MAX, &right_x, FALSE );
 			text_left = right_x;
@@ -1004,7 +1006,7 @@ void LLFolderViewItem::draw()
 				S32_MAX, S32_MAX, &right_x, FALSE );
 		}
 
-		if (sBoxImage.notNull() && mStringMatchOffset != std::string::npos)
+		if (mStringMatchOffset != std::string::npos)
 		{
 			// don't draw backgrounds for zero-length strings
 			S32 filter_string_length = getRoot()->getFilterSubString().size();
@@ -1015,9 +1017,10 @@ void LLFolderViewItem::draw()
 				S32 right = left + font->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
 				S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3);
 				S32 top = getRect().getHeight();
-				
+		
+				LLUIImage* box_image = default_params.selection_image;
 				LLRect box_rect(left, top, right, bottom);
-				sBoxImage->draw(box_rect, sFilterBGColor);
+				box_image->draw(box_rect, sFilterBGColor);
 				F32 match_string_left = text_left + font->getWidthF32(combined_string, 0, mStringMatchOffset);
 				F32 y = (F32)getRect().getHeight() - font->getLineHeight() - (F32)TEXT_PAD;
 				font->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 6f8c738a59..9e35f75c96 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -101,7 +101,10 @@ public:
 		Optional<LLFolderViewEventListener*>	listener;
 
 		Optional<LLUIImage*>					folder_arrow_image;
+		Optional<S32>							folder_indentation; // pixels
 		Optional<LLUIImage*>					selection_image;
+		Optional<const LLFontGL*>				font;
+		Optional<S32>							item_height; // pixels
 
 		Optional<S32>							creation_date; //UTC seconds
 
@@ -110,7 +113,7 @@ public:
 
 	// layout constants
 	static const S32 LEFT_PAD = 5;
-    // LEFT_INDENTATION is set via settings.xml FolderIndentation
+    // LEFT_INDENTATION is set via folder_indentation above
 	static const S32 ICON_PAD = 2;
 	static const S32 ICON_WIDTH = 16;
 	static const S32 TEXT_PAD = 1;
@@ -127,11 +130,7 @@ protected:
 	friend class LLUICtrlFactory;
 	friend class LLFolderViewEventListener;
 
-	LLFolderViewItem(Params p = LLFolderViewItem::Params());
-
-	static const LLFontGL*		sSmallFont;
-	static LLUIImagePtr			sArrowImage;
-	static LLUIImagePtr			sBoxImage;
+	LLFolderViewItem(const Params& p);
 
 	std::string					mLabel;
 	std::string					mSearchableLabel;
@@ -150,6 +149,7 @@ protected:
 	LLUIImagePtr				mIconOpen;
 	BOOL						mHasVisibleChildren;
 	S32							mIndentation;
+	S32							mItemHeight;
 	S32							mNumDescendantsSelected;
 	BOOL						mPassedFilter;
 	S32							mLastFilterGeneration;
@@ -157,8 +157,6 @@ protected:
 	F32							mControlLabelRotation;
 	LLFolderView*				mRoot;
 	BOOL						mDragAndDropTarget;
-	LLUIImagePtr				mArrowImage;
-	LLUIImagePtr				mBoxImage;
 	BOOL                        mIsLoading;
 	LLTimer                     mTimeSinceRequestStart;
 	bool						mHidden;
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 08cf86df4a..8ad94b957d 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -287,7 +287,7 @@ void LLHUDText::renderText(BOOL for_select)
 	mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f));
 
 	// *TODO: cache this image
-	LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
+	LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square");
 
 	// *TODO: make this a per-text setting
 	LLColor4 bg_color = LLUIColorTable::instance().getColor("BackgroundChatColor");
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index f30821cacf..a96240e31c 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -436,7 +436,7 @@ void LLManip::renderXYZ(const LLVector3 &vec)
 
 	glPushMatrix();
 	{
-		LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
+		LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square");
 		gViewerWindow->setup2DRender();
 		const LLVector2& display_scale = gViewerWindow->getDisplayScale();
 		glScalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 75424e71f5..dab11149b9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -167,6 +167,7 @@ with the same filename but different name
 
   <texture name="Flag" file_name="navbar/Flag.png" preload="false" />
 
+  <texture name="Folder_Arrow" file_name="folder_arrow.tga" preload="false" />
   <texture name="ForSale_Badge" file_name="icons/ForSale_Badge.png" preload="false" />
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
@@ -439,6 +440,7 @@ with the same filename but different name
 
   <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true" />
 
+  <texture name="Rounded_Square"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
   <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="false" />
 
   <texture name="ScrollArrow_Down" file_name="widgets/ScrollArrow_Down.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
@@ -676,7 +678,6 @@ with the same filename but different name
   <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
 
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
-  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f97ccafecc..cc00abf5a0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -76,7 +76,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left="128"
      name="LowGraphicsDivet"
@@ -85,7 +85,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="83"
      name="MidGraphicsDivet"
@@ -94,7 +94,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="85"
      name="HighGraphicsDivet"
@@ -103,7 +103,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="83"
      name="UltraGraphicsDivet"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 18c2228906..727c5fb7b2 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -54,7 +54,7 @@
                      color="LoginProgressBoxCenterColor"
                      follows="left|right|bottom|top"
                      height="250"
-                     image_name="rounded_square.tga"
+                     image_name="Rounded_Square"
                      layout="topleft"
                      left="0"
                      top="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
new file mode 100644
index 0000000000..b0e403a7a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<folder_view_item
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="15"
+  font="SansSerifSmall"
+  item_height="30" 
+  selection_image="Rounded_Square"
+  />
-- 
cgit v1.2.3


From 6fc07313196b430573efe3be7dfcffa6d7b4b957 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 11 Jan 2010 14:04:06 -0500
Subject: ext-3910 Instant Messages isn't in ALL CAPS like other windows

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index cd297af99d..ccbba61ddf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -9,7 +9,7 @@
  save_rect="true"
  save_visibility="true"
  single_instance="true"
- title="Instant Messages"
+ title="CONVERSATIONS"
  width="392">
     <tab_container
      follows="left|right|top|bottom"
-- 
cgit v1.2.3


From 20c01befd226c7f48462c5812f5abd725a1d18e3 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 11 Jan 2010 11:07:18 -0800
Subject: New art for landmarks and places - replacing the pushpin with a globe
 - reviewed with esbee

---
 .../skins/default/textures/icons/Inv_Landmark.png       | Bin 532 -> 582 bytes
 .../default/textures/taskpanel/TabIcon_Places_Off.png   | Bin 335 -> 405 bytes
 .../textures/taskpanel/TabIcon_Places_Selected.png      | Bin 456 -> 653 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
index f8ce765c50..76df984596 100644
Binary files a/indra/newview/skins/default/textures/icons/Inv_Landmark.png and b/indra/newview/skins/default/textures/icons/Inv_Landmark.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
index ada28e01da..f5a5f7a846 100644
Binary files a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png and b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
index 0f8d5619ec..8e0fb9661e 100644
Binary files a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png and b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png differ
-- 
cgit v1.2.3


From 6473dbf588746ca6871dd89c80ecace1a50a5672 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 11 Jan 2010 11:58:56 -0800
Subject: EXT-3695, EXT-2034 Line height, padding in inventory customizable in
 XUI via folder_view_item.xml EXT-3753 Inventory folders now have customizable
 item indents and "My Inventory" has indent again Reviewed with Richard

---
 indra/newview/llfolderviewitem.cpp                 | 73 ++++++++++++----------
 indra/newview/llfolderviewitem.h                   |  2 +-
 indra/newview/skins/default/colors.xml             |  3 +
 .../default/xui/en/widgets/folder_view_item.xml    |  6 +-
 4 files changed, 47 insertions(+), 37 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 41ceb5972e..2363f51d80 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -101,8 +101,8 @@ LLFolderViewItem::Params::Params()
 	folder_arrow_image("folder_arrow_image"),
 	folder_indentation("folder_indentation"),
 	selection_image("selection_image"),
-	font("font"),
 	item_height("item_height"),
+	item_top_pad("item_top_pad"),
 	creation_date()
 {
 	mouse_opaque(true);
@@ -830,12 +830,15 @@ void LLFolderViewItem::draw()
 	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
 	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
 	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	static LLUIColor sFocusOutlineColor =
+		LLUIColorTable::instance().getColor("InventoryFocusOutlineColor", DEFAULT_WHITE);
 	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
 	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
 	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
 	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 
 	const Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
+	const S32 TOP_PAD = default_params.item_top_pad;
 
 	bool possibly_has_children = false;
 	bool up_to_date = mListener && mListener->isUpToDate();
@@ -847,7 +850,8 @@ void LLFolderViewItem::draw()
 	if(/*mControlLabel[0] != '\0' && */possibly_has_children)
 	{
 		LLUIImage* arrow_image = default_params.folder_arrow_image;
-		gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
+		gl_draw_scaled_rotated_image(
+			mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD - TOP_PAD,
 			ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, arrow_image->getImage(), sFgColor);
 	}
 
@@ -858,6 +862,10 @@ void LLFolderViewItem::draw()
 	// If we have keyboard focus, draw selection filled
 	BOOL show_context = getRoot()->getShowSelectionContext();
 	BOOL filled = show_context || (getRoot()->getParentPanel()->hasFocus());
+	const S32 FOCUS_LEFT = 1;
+	S32 focus_top = getRect().getHeight();
+	S32 focus_bottom = getRect().getHeight() - mItemHeight;
+	bool folder_open = (getRect().getHeight() > mItemHeight + 4);
 
 	// always render "current" item, only render other selected items if
 	// mShowSingleSelection is FALSE
@@ -865,7 +873,6 @@ void LLFolderViewItem::draw()
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		LLColor4 bg_color = sHighlightBgColor;
-		//const S32 TRAILING_PAD = 5;  // It just looks better with this.
 		if (!mIsCurSelection)
 		{
 			// do time-based fade of extra objects
@@ -883,35 +890,35 @@ void LLFolderViewItem::draw()
 		}
 
 		gl_rect_2d(
-			0, 
-			getRect().getHeight(), 
+			FOCUS_LEFT,
+			focus_top, 
 			getRect().getWidth() - 2,
-			llfloor(getRect().getHeight() - mItemHeight),
+			focus_bottom,
 			bg_color, filled);
 		if (mIsCurSelection)
 		{
 			gl_rect_2d(
-				0, 
-				getRect().getHeight(), 
+				FOCUS_LEFT, 
+				focus_top, 
 				getRect().getWidth() - 2,
-				llfloor(getRect().getHeight() - mItemHeight),
-				sHighlightFgColor, FALSE);
+				focus_bottom,
+				sFocusOutlineColor, FALSE);
 		}
-		if (getRect().getHeight() > mItemHeight + 4)
+		if (folder_open)
 		{
 			gl_rect_2d(
-				0, 
-				llfloor(getRect().getHeight() - mItemHeight) - 4, 
+				FOCUS_LEFT,
+				focus_bottom + 1, // overlap with bottom edge of above rect
 				getRect().getWidth() - 2,
-				2,
-				sHighlightFgColor, FALSE);
+				0,
+				sFocusOutlineColor, FALSE);
 			if (show_context)
 			{
 				gl_rect_2d(
-					0, 
-					llfloor(getRect().getHeight() - mItemHeight) - 4, 
+					FOCUS_LEFT,
+					focus_bottom + 1,
 					getRect().getWidth() - 2,
-					2,
+					0,
 					sHighlightBgColor, TRUE);
 			}
 		}
@@ -920,32 +927,32 @@ void LLFolderViewItem::draw()
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		gl_rect_2d(
-			0, 
-			getRect().getHeight(), 
+			FOCUS_LEFT, 
+			focus_top, 
 			getRect().getWidth() - 2,
-			llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD),
+			focus_bottom,
 			sHighlightBgColor, FALSE);
-
-		if (getRect().getHeight() > llround(font->getLineHeight()) + ICON_PAD + 2)
+		if (folder_open)
 		{
 			gl_rect_2d(
-				0, 
-				llfloor(getRect().getHeight() - font->getLineHeight() - ICON_PAD) - 2, 
+				FOCUS_LEFT,
+				focus_bottom + 1, // overlap with bottom edge of above rect
 				getRect().getWidth() - 2,
-				2,
+				0,
 				sHighlightBgColor, FALSE);
 		}
 		mDragAndDropTarget = FALSE;
 	}
 
+	S32 icon_x = mIndentation + ARROW_SIZE + TEXT_PAD;
 	// First case is used for open folders
 	if (!mIconOpen.isNull() && (llabs(mControlLabelRotation) > 80))
  	{
-		mIconOpen->draw(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight());
+		mIconOpen->draw(icon_x, getRect().getHeight() - mIconOpen->getHeight() - TOP_PAD + 1);
 	}
 	else if(mIcon)
 	{
- 		mIcon->draw(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight());
+ 		mIcon->draw(icon_x, getRect().getHeight() - mIcon->getHeight() - TOP_PAD + 1);
  	}
 
 	if (!mLabel.empty())
@@ -954,7 +961,7 @@ void LLFolderViewItem::draw()
 		BOOL debug_filters = getRoot()->getDebugFilters();
 		LLColor4 color = ( (mIsSelected && filled) ? sHighlightFgColor : sFgColor );
 		F32 right_x;
-		F32 y = (F32)getRect().getHeight() - font->getLineHeight() - (F32)TEXT_PAD;
+		F32 y = (F32)getRect().getHeight() - font->getLineHeight() - (F32)TEXT_PAD - (F32)TOP_PAD;
 
 		if (debug_filters)
 		{
@@ -1015,15 +1022,15 @@ void LLFolderViewItem::draw()
 				std::string combined_string = mLabel + mLabelSuffix;
 				S32 left = llround(text_left) + font->getWidth(combined_string, 0, mStringMatchOffset) - 1;
 				S32 right = left + font->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
-				S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3);
-				S32 top = getRect().getHeight();
+				S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3 - TOP_PAD);
+				S32 top = getRect().getHeight() - TOP_PAD;
 		
 				LLUIImage* box_image = default_params.selection_image;
 				LLRect box_rect(left, top, right, bottom);
 				box_image->draw(box_rect, sFilterBGColor);
 				F32 match_string_left = text_left + font->getWidthF32(combined_string, 0, mStringMatchOffset);
-				F32 y = (F32)getRect().getHeight() - font->getLineHeight() - (F32)TEXT_PAD;
-				font->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
+				F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)TEXT_PAD - (F32)TOP_PAD;
+				font->renderUTF8( combined_string, mStringMatchOffset, match_string_left, yy,
 								  sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
 								  filter_string_length, S32_MAX, &right_x, FALSE );
 			}
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 9e35f75c96..14fac5bdf9 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -103,8 +103,8 @@ public:
 		Optional<LLUIImage*>					folder_arrow_image;
 		Optional<S32>							folder_indentation; // pixels
 		Optional<LLUIImage*>					selection_image;
-		Optional<const LLFontGL*>				font;
 		Optional<S32>							item_height; // pixels
+		Optional<S32>							item_top_pad; // pixels
 
 		Optional<S32>							creation_date; //UTC seconds
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 887cff56f6..0044daf6b4 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -395,6 +395,9 @@
     <color
      name="InventoryBackgroundColor"
      reference="Unused?" />
+    <color
+     name="InventoryFocusOutlineColor"
+     reference="EmphasisColor" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index b0e403a7a5..e6bdcccfdf 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
-  folder_indentation="15"
-  font="SansSerifSmall"
-  item_height="30" 
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
   selection_image="Rounded_Square"
   />
-- 
cgit v1.2.3


From 572424ffac0401f311740b619da040b1b5077a55 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 11 Jan 2010 15:06:59 -0500
Subject: ext-4116 bad label position on Region/Estate/ Ground Textures

---
 .../skins/default/xui/en/panel_region_texture.xml  | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index a4d24cb0fc..502a5804c3 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -136,7 +136,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl5"
-     top="186"
+     top="170"
      width="300">
         Texture Elevation Ranges
     </text>
@@ -146,7 +146,7 @@
      layout="topleft"
      left="51"
      name="height_text_lbl6"
-     top="201"
+     top="185"
      width="100">
         Southwest
     </text>
@@ -171,7 +171,7 @@
     max_val="500"
     min_val="-500"
     name="height_start_spin_0"
-    top_delta="20"
+    top_delta="15"
     width="100" />
   <spinner
    follows="left|top"
@@ -216,9 +216,9 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left="51"
      name="height_text_lbl8"
-     top_delta="0"
+     top_pad="10"
      width="100">
         Southeast
     </text>
@@ -243,7 +243,7 @@
        max_val="500"
        min_val="-500"
        name="height_start_spin_2"
-       top_delta="20"
+       top_delta="15"
        width="100" />
       <spinner
        follows="left|top"
@@ -291,9 +291,9 @@
        left="10"
        name="height_text_lbl10"
        top_delta="30"
-       width="270">
-        These values represent the blend range
-        for the textures above.
+       width="400"
+       wrap="true">
+        These values represent the blend range for the textures above.
       </text>
       <text
        follows="left|top"
@@ -302,11 +302,9 @@
        left_delta="0"
        name="height_text_lbl11"
        top_delta="32"
-       width="270">
-        Measured in meters, the LOW value
-        is the MAXIMUM height of Texture #1,
-        and the HIGH value is the MINIMUM
-        height of Texture #4.
+       width="400"
+       wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
       </text>
     <button
      enabled="false"
-- 
cgit v1.2.3


From 81cde841c2de3da72f719167dc11b5a1ab1988f9 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 11 Jan 2010 15:53:55 -0500
Subject: ext-4015 Preferences: non-standard position of field labels

---
 .../default/xui/en/panel_preferences_privacy.xml   |  36 +++----
 .../default/xui/en/panel_preferences_setup.xml     | 106 ++++++++++-----------
 2 files changed, 68 insertions(+), 74 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 5dd93d0f7e..1c1e17eb5a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -134,18 +134,6 @@
      name="show_timestamps_check_im"
      top_pad="10"
      width="237" />
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogFolder"
-     enabled="false"
-     follows="top|left|right"
-     halign="right"
-     height="19"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5" />
     <text
      type="string"
      length="1"
@@ -155,11 +143,23 @@
      left_delta="0"
      mouse_opaque="false"
      name="log_path_desc"
-     top_pad="1"
-     width="128"
-     text_color="LtGray_50">
-        Location of logs
+     top_pad="5"
+     width="128">
+        Location of logs:
     </text>    
+    <line_editor
+     bottom="366"
+     control_name="InstantMessageLogFolder"
+     enabled="false"
+     follows="top|left|right"
+     halign="right"
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="log_path_string"
+     top_pad="5"
+     width="250"/>
     <button
 	 enabled="false"
      follows="right|bottom"
@@ -167,9 +167,9 @@
      label="Browse"
      label_selected="Browse"
      layout="topleft"
-     left_pad="115"
+     left_pad="5"
      name="log_path_button"
-     top_delta="-21"
+     top_delta="0"
      width="145">
         <button.commit_callback
          function="Pref.LogPath" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2c60271801..f6900cc31c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -134,20 +134,20 @@
 		 parameter="ChangeConnectionPort" />
     </check_box>
     <spinner
-     control_name="ConnectionPort"
-     enabled_control="ConnectionPortEnabled"
+     control_name="BrowserProxyPort"
+     enabled_control="BrowserProxyEnabled"
 	 decimal_digits="0"
      follows="left|top"
      height="23"
      increment="1"
-     initial_value="13000"
+     initial_value="80"
      label="Port number:"
      label_width="75"
      layout="topleft"
      left_delta="160"
-     max_val="13050"
-     min_val="13000"
-     name="connection_port"
+     max_val="12000"
+     min_val="10"
+     name="web_proxy_port"
      top_delta="-2"
      width="140" />
     <text
@@ -176,7 +176,7 @@
      max_val="1024"
      min_val="32"
      name="cache_size"
-     top_delta="-1"
+     top_delta="-2"
      width="180" />
     <text
      type="string"
@@ -191,6 +191,18 @@
      width="40">
         MB
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     name="Cache location"
+     top_delta="20"
+     width="300">
+        Cache location:
+    </text>
     <line_editor
      control_name="CacheLocationTopFolder"
      border_style="line"
@@ -199,12 +211,12 @@
      follows="left|top"
      font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left="80"
      max_length="4096"
      name="cache_location"
-     top_pad="20"
+     top_pad="5"
      width="205" />
     <button
      follows="left|top"
@@ -232,20 +244,6 @@
         <button.commit_callback
          function="Pref.ResetCache" />
     </button>
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="80"
-     name="Cache location"
-     top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Cache location
-    </text>
     <text
      type="string"
      length="1"
@@ -296,53 +294,49 @@
      follows="left|top"
      height="16"
      initial_value="false"
-     control_name="BrowserProxyEnabled" 
-     label="Enable Web Proxy"
+     label="Web proxy"
      left_delta="0"
      mouse_opaque="true"
      name="web_proxy_enabled"
      radio_style="false"
-     width="400" />
-    <line_editor
-     control_name="BrowserProxyAddress"
-     enabled_control="BrowserProxyEnabled"
-	 follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="1"
-     name="web_proxy_editor"
-     tool_tip="The name or IP address of the proxy you would like to use"
-     top_pad="4"
-     width="200" />
+     width="400"
+     top_pad="5"/>
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left_delta="0"
+     left_delta="1"
      name="Proxy location"
      top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Proxy location
+     width="300">
+        Proxy location:
     </text>
-  <spinner
-     control_name="BrowserProxyPort"
+    <line_editor
+     control_name="BrowserProxyAddress"
      enabled_control="BrowserProxyEnabled"
-	 decimal_digits="0"
+	 follows="left|top"
+     font="SansSerif"
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     name="web_proxy_editor"
+     tool_tip="The name or IP address of the proxy you would like to use"
+     top_pad="4"
+     width="200" />
+    <button
      follows="left|top"
      height="23"
-     increment="1"
-     initial_value="80"
-     label="Port number:"
-     label_width="75"
+     enabled="false"
+     label="Browse"
+     label_selected="Browse"
      layout="topleft"
-     left_delta="230"
-     max_val="12000"
-     min_val="10"
-     name="web_proxy_port"
-     top_delta="-20"
-     width="140" />
-</panel>
+     left_pad="5"
+     name="set_proxy"
+     top_pad="-21"
+     width="100">
+        <button.commit_callback
+         function="Pref.SetCache" />
+    </button>
+  </panel>
-- 
cgit v1.2.3


From 09dc1af21c7b723059f6ff1c46eabafb088daa3b Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 11 Jan 2010 16:26:22 -0500
Subject: ext-3820 [BSI] Preferences > Chat > Show IMs In: does not take effect
 without restart

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 017c321767..6e0b94ac2b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -318,15 +318,15 @@
      height="20"
      width="300"
      top_pad="20">
-     Show IMs in:
+     Show IMs in: (Requires restart)
     </text>
     <radio_group
      height="30"
      layout="topleft"
-     left="30"
+     left_delta="30"
      control_name="ChatWindow"
      name="chat_window"
-     top_pad="10"
+     top_pad="0"
      tool_tip="Show your Instant Messages in separate windows, or in one window with many tabs (Requires restart)"
      width="331">
      <radio_item
@@ -342,10 +342,10 @@
       height="16"
       label="One window"
       layout="topleft"
-      left_delta="145"
+      left_delta="0"
       name="radio2"
       value="1"
-      top_delta="0"
+      top_pad="5"
       width="150" />
     </radio_group>
 </panel>
-- 
cgit v1.2.3


From 8f4c2a59db47283e1edb8ae7f6dee4466b95d1e9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 11 Jan 2010 16:36:27 -0500
Subject: For EXT-4068: [BSI] right click several times on an inventory item
 produces several second hang.  Improved speed of panel finding by restricting
 search to only panels, saving time when inventory is very large

---
 indra/newview/llsidetray.cpp | 52 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 608165022f..d1236b948e 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -641,24 +641,60 @@ LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& para
 	return NULL;
 }
 
-LLPanel*	LLSideTray::getPanel		(const std::string& panel_name)
+// This is just LLView::findChildView specialized to restrict the search to LLPanels.
+// Optimization for EXT-4068 to avoid searching down to the individual item level
+// when inventories are large.
+LLPanel *findChildPanel(LLPanel *panel, const std::string& name, bool recurse, S32& count)
 {
-	child_vector_const_iter_t child_it;
-	for ( child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
+	for (LLView::child_list_const_iter_t child_it = panel->beginChild();
+		 child_it != panel->endChild(); ++child_it)
 	{
-		LLView* view = (*child_it)->findChildView(panel_name,true);
-		if(view)
+		count++;
+		LLPanel *child_panel = dynamic_cast<LLPanel*>(*child_it);
+		if (!child_panel)
+			continue;
+		if (child_panel->getName() == name)
+			return child_panel;
+	}
+	if (recurse)
+	{
+		for (LLView::child_list_const_iter_t child_it = panel->beginChild();
+			 child_it != panel->endChild(); ++child_it)
 		{
-			LLPanel* panel = dynamic_cast<LLPanel*>(view);
-			if(panel)
+			count++;
+			LLPanel *child_panel = dynamic_cast<LLPanel*>(*child_it);
+			if (!child_panel)
+				continue;
+			LLPanel *found_panel = findChildPanel(child_panel,name,recurse,count);
+			if (found_panel)
 			{
-				return panel;
+				return found_panel;
 			}
 		}
 	}
 	return NULL;
 }
 
+LLPanel* LLSideTray::getPanel(const std::string& panel_name)
+{
+	static S32 max_count = 0;
+	S32 count = 0;
+	for ( child_vector_const_iter_t child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
+	{
+		LLPanel *panel = findChildPanel(*child_it,panel_name,true,count);
+		if (count > max_count)
+		{
+			max_count = count;
+			llwarns << "max_count " << max_count << llendl;
+		}
+		if(panel)
+		{
+			return panel;
+		}
+	}
+	return NULL;
+}
+
 LLPanel*	LLSideTray::getActivePanel()
 {
 	if (mActiveTab && !mCollapsed)
-- 
cgit v1.2.3


From ba1f246503bd4c4334a0e6c2de78d790e262a276 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 11 Jan 2010 13:58:42 -0800
Subject: EXT-3687 Inventory and Outfits lists don't fill panel need DkGray2
 background EXT-4044 Inventory and Outfits scroll region has no background
 color/border Moved background color initialization to inventory_panel.xml
 Fixed search highlight color and extra borders no longer needed now that
 colors are correct.  Reviewed with Simon.

---
 indra/newview/llinventorypanel.cpp                             | 4 ----
 indra/newview/skins/default/colors.xml                         | 4 ++--
 indra/newview/skins/default/xui/en/panel_landmarks.xml         | 8 ++++----
 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml | 6 ++++++
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 498a29728c..9141d50829 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -98,10 +98,6 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&LLInventoryPanel::attachObject, this, _2));
 	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
 	
-	setBackgroundColor(LLUIColorTable::instance().getColor("InventoryBackgroundColor"));
-	setBackgroundVisible(TRUE);
-	setBackgroundOpaque(TRUE);
-	
 	if (mStartFolderString != "")
 	{
 		mBuildDefaultHierarchy = false;
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0044daf6b4..6da38fa0d4 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -292,7 +292,7 @@
      reference="White" />
      <color
      name="FilterBackgroundColor"
-     reference="MouseGray" />
+     reference="Black" />
     <color
      name="FilterTextColor"
      value="0.38 0.69 0.57 1" />
@@ -394,7 +394,7 @@
      reference="White" />
     <color
      name="InventoryBackgroundColor"
-     reference="Unused?" />
+     reference="DkGray2" />
     <color
      name="InventoryFocusOutlineColor"
      reference="EmphasisColor" />
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index c899dcb750..039e1ae086 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -25,7 +25,7 @@
          title="Favorites bar">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -41,7 +41,7 @@
          title="Landmarks">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -57,7 +57,7 @@
          title="My Inventory">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -73,7 +73,7 @@
            title="Library">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="120"
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
new file mode 100644
index 0000000000..93875d66e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  bg_opaque_color="InventoryBackgroundColor"
+  background_visible="true"
+  background_opaque="true"
+  />
-- 
cgit v1.2.3


From fb9a20802f3386bee82a8bd9a479f209374fa9a4 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 11 Jan 2010 14:18:43 -0800
Subject: Better resolution of merge conflict

---
 indra/newview/llinspectavatar.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 22451998c6..8f4fba244d 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -534,7 +534,6 @@ void LLInspectAvatar::updateVolumeSlider()
 		// By convention, we only display and toggle voice mutes, not all mutes
 		bool is_muted = LLMuteList::getInstance()->
 							isMuted(mAvatarID, LLMute::flagVoiceChat);
-	bool is_self = (mAvatarID == gAgent.getID());
 
 		LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
 
@@ -542,11 +541,9 @@ void LLInspectAvatar::updateVolumeSlider()
 
 		mute_btn->setEnabled( !is_linden);
 		mute_btn->setValue( is_muted );
-	mute_btn->setVisible( voice_enabled && !is_self );
 
 		LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
 		volume_slider->setEnabled( !is_muted );
-	volume_slider->setVisible( voice_enabled && !is_self );
 
 		const F32 DEFAULT_VOLUME = 0.5f;
 		F32 volume;
-- 
cgit v1.2.3