From 2f81a12731306077cb7a598ecda68c712de054fc Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Mon, 9 Jul 2012 12:42:01 +0200
Subject: [PATCH] Make nearby media list entry color configurable - FIRE-6840

---
 indra/newview/llpanelnearbymedia.cpp   | 5 ++++-
 indra/newview/skins/default/colors.xml | 6 ++++++
 indra/newview/skins/vintage/colors.xml | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 3ecc0d02ef..8f871b469a 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -463,7 +463,10 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
 		
 		// *TODO: Make these font styles/colors configurable via XUI
 		U8 font_style = LLFontGL::NORMAL;
-		LLColor4 cell_color = LLColor4::white;
+		// <FS:Zi> Make nearby media list entry color configurable
+		// LLColor4 cell_color = LLColor4::white;
+		LLColor4 cell_color = LLUIColorTable::instance().getColor("MediaListItemColor");
+		// </FS:Zi>
 		
 		// Only colorize by class in debug
 		if (mDebugInfoVisible)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 80f22dd5a1..f109eabd4e 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1054,4 +1054,10 @@
   <color
     name="blue"
     value="0 0 1 1"/>
+
+  <!-- <FS:Zi> Color for nearby media list items -->
+  <color
+    name="MediaListItemColor"
+    reference="white" />
+  <!-- </FS:Zi> -->
 </colors>
diff --git a/indra/newview/skins/vintage/colors.xml b/indra/newview/skins/vintage/colors.xml
index a377ab4802..cbd8992613 100644
--- a/indra/newview/skins/vintage/colors.xml
+++ b/indra/newview/skins/vintage/colors.xml
@@ -249,4 +249,8 @@
 	<color
 		name="ChatTimestampColor"
 		value="0.5 0.5 0.5 1.0" />
+	<!-- nearby media list items -->
+	<color
+		name="MediaListItemColor"
+		reference="ScrollUnselectedColor" />
 </colors>