diff options
| author | McCabe Maxsted | 2010-08-29 11:18:59 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-29 11:19:12 -0700 |
| commit | 0061a5ed4e6995f8b759744369ac9719426847e5 (patch) | |
| tree | 784eb6726f0ae5625093d84a20907e5e7fc76ddb /linden/indra/newview | |
| parent | Tidied up the sky/water editors (both use a flyout_button to save now). Still... (diff) | |
| download | meta-impy-0061a5ed4e6995f8b759744369ac9719426847e5.zip meta-impy-0061a5ed4e6995f8b759744369ac9719426847e5.tar.gz meta-impy-0061a5ed4e6995f8b759744369ac9719426847e5.tar.bz2 meta-impy-0061a5ed4e6995f8b759744369ac9719426847e5.tar.xz | |
Fixed windlight water notecards (.ww) not displaying their icon in inventory
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index bf2d898..ebbccfe 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
| @@ -3137,6 +3137,10 @@ LLUIImagePtr LLNotecardBridge::getIcon() const | |||
| 3137 | { | 3137 | { |
| 3138 | return LLUI::getUIImage("Inv_WindLight"); | 3138 | return LLUI::getUIImage("Inv_WindLight"); |
| 3139 | } | 3139 | } |
| 3140 | else if(isWaterSetting()) | ||
| 3141 | { | ||
| 3142 | return LLUI::getUIImage("Inv_WaterLight"); | ||
| 3143 | } | ||
| 3140 | else | 3144 | else |
| 3141 | { | 3145 | { |
| 3142 | return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE); | 3146 | return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE); |