diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
| commit | a072b63f4106b707ce0cea7826223433f5bba352 (patch) | |
| tree | 4f1b3ad15b57a58508e0402c2f6cbeb31a4928f8 /indra/newview/llviewertexteditor.cpp | |
| parent | 0c1ff8e8769a569c2551a2be04a18cc854cfc5d4 (diff) | |
| parent | 1944f64107be98f344824045a19e113966591340 (diff) | |
Merge of PE merge with extra head
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index ea8af223c3..c9b3886fef 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -524,7 +524,10 @@ LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const break; case LLAssetType::AT_SOUND: img_name = "Inv_Sound"; break; case LLAssetType::AT_CLOTHING: img_name = "Inv_Clothing"; break; - case LLAssetType::AT_OBJECT: img_name = "Inv_Object"; break; + case LLAssetType::AT_OBJECT: + img_name = LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & item->getFlags() ? + "Inv_Object_Multi" : "Inv_Object"; + break; case LLAssetType::AT_CALLINGCARD: img_name = "Inv_CallingCard"; break; case LLAssetType::AT_LANDMARK: img_name = "Inv_Landmark"; break; case LLAssetType::AT_NOTECARD: img_name = "Inv_Notecard"; break; |