diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-11 14:37:25 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-11 14:37:25 -0700 |
| commit | 0ebf74a2295533ac60227c26e52c74d83865c84d (patch) | |
| tree | fc0e9fb79864674efe4affcf13831731df0be11b /indra/newview/llinventoryicon.cpp | |
| parent | ae2821458cfc336a0c2422657ae3ca7cac05a071 (diff) | |
| parent | 37dc96ccdde6263188ffc4f620492a4bb2017761 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 474076b541..82c4d7778f 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -36,7 +36,7 @@ #include "lldictionary.h" #include "llinventorydefines.h" #include "llui.h" -#include "llwearabledictionary.h" +#include "llwearabletype.h" struct IconEntry : public LLDictionaryEntry { @@ -136,7 +136,7 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, idx = (misc_flag != 0) ? ICONNAME_CALLINGCARD_ONLINE : ICONNAME_CALLINGCARD_OFFLINE; break; case LLAssetType::AT_LANDMARK: - idx = (misc_flag != 0) ? ICONNAME_LANDMARK_VISITED : idx = ICONNAME_LANDMARK; + idx = (misc_flag != 0) ? ICONNAME_LANDMARK_VISITED : ICONNAME_LANDMARK; break; case LLAssetType::AT_SCRIPT: case LLAssetType::AT_LSL_TEXT: @@ -182,6 +182,6 @@ const std::string& LLInventoryIcon::getIconName(EIconName idx, BOOL item_is_link LLInventoryIcon::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag) { - const EWearableType wearable_type = EWearableType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag); - return LLWearableDictionary::instance().getIconName(wearable_type); + const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag); + return LLWearableType::getIconName(wearable_type); } |