From ce2e2dba3ddcd1185fd48bdeb76b425dfa347799 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 26 Aug 2010 18:41:50 +0200
Subject: Katharine Berry: Added an icon for WindLight settings.

---
 linden/indra/newview/llinventorybridge.cpp             | 18 ++++++++++++++----
 .../indra/newview/skins/default/textures/textures.xml  |  4 ++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 7396eac..efa0d20 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -2999,10 +2999,7 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
 std::string LLNotecardBridge::sPrefix("Note: ");
 
 
-LLUIImagePtr LLNotecardBridge::getIcon() const
-{
-	return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
-}
+
 
 void open_notecard(LLViewerInventoryItem* inv_item,
 				   const std::string& title,
@@ -3129,6 +3126,19 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 */
 }
 
+LLUIImagePtr LLNotecardBridge::getIcon() const
+{
+	bool is_windlight = (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
+	if(is_windlight)
+	{
+		return LLUI::getUIImage("Inv_WindLight");
+	}
+	else
+	{
+		return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
+	}
+}
+
 // +=================================================+
 // |        LLGestureBridge                          |
 // +=================================================+
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index ad1a1b6..fef6c05 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -375,4 +375,8 @@
   <texture name="default_land_picture.j2c"/>
   <texture name="default_profile_picture.j2c"/>
   <texture name="locked_image.j2c"/>
+
+   <!-- Kitty Viewer Art -->
+   <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
+
 </textures>
-- 
cgit v1.1