aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/newview/llinventorybridge.cpp18
-rw-r--r--linden/indra/newview/skins/default/textures/textures.xml4
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,
2999std::string LLNotecardBridge::sPrefix("Note: "); 2999std::string LLNotecardBridge::sPrefix("Note: ");
3000 3000
3001 3001
3002LLUIImagePtr LLNotecardBridge::getIcon() const 3002
3003{
3004 return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
3005}
3006 3003
3007void open_notecard(LLViewerInventoryItem* inv_item, 3004void open_notecard(LLViewerInventoryItem* inv_item,
3008 const std::string& title, 3005 const std::string& title,
@@ -3129,6 +3126,19 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
3129*/ 3126*/
3130} 3127}
3131 3128
3129LLUIImagePtr LLNotecardBridge::getIcon() const
3130{
3131 bool is_windlight = (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
3132 if(is_windlight)
3133 {
3134 return LLUI::getUIImage("Inv_WindLight");
3135 }
3136 else
3137 {
3138 return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
3139 }
3140}
3141
3132// +=================================================+ 3142// +=================================================+
3133// | LLGestureBridge | 3143// | LLGestureBridge |
3134// +=================================================+ 3144// +=================================================+
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 @@
375 <texture name="default_land_picture.j2c"/> 375 <texture name="default_land_picture.j2c"/>
376 <texture name="default_profile_picture.j2c"/> 376 <texture name="default_profile_picture.j2c"/>
377 <texture name="locked_image.j2c"/> 377 <texture name="locked_image.j2c"/>
378
379 <!-- Kitty Viewer Art -->
380 <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
381
378</textures> 382</textures>