From a18a1016cb6a1017ca5fd3bbac3d1197174ce078 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 27 Aug 2010 00:56:44 +0200
Subject: Katharine Berry: Added understanding of .ww notecards to inventory
 panel.

---
 linden/indra/newview/llinventorybridge.cpp                      | 4 ++++
 linden/indra/newview/skins/default/textures/textures.xml        | 2 +-
 linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index a3fc36e..a3a6e78 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -3102,6 +3102,10 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			{
 				items.push_back(std::string("Use WindLight Settings"));
 			}
+			else if(isWaterSetting())
+			{
+				items.push_back(std::string("Use WaterLight Settings"));
+			}
 			items.push_back(std::string("Edit WindLight Settings"));
 		}
 		items.push_back(std::string("Properties"));
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index fef6c05..0b4a088 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -378,5 +378,5 @@
 
    <!-- Kitty Viewer Art -->
    <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
-
+   <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" />
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 2c837a2..78fc75e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -145,6 +145,10 @@
 			name="Use WindLight Settings" width="128">
         	<on_click filter="" function="Inventory.DoToSelected" userdata="load_windlight" />
 	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Use Water Settings" left="0" mouse_opaque="true" 
+			name="Use WaterLight Settings" width="128">
+        	<on_click filter="" function="Inventory.DoToSelected" userdata="load_waterlight" />
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Edit WindLight Settings" left="0" mouse_opaque="true" 
 			name="Edit WindLight Settings" width="128">
         	<on_click filter="" function="Inventory.DoToSelected" userdata="edit_windlight" />
-- 
cgit v1.1