diff options
| author | callum <none@none> | 2010-06-10 16:58:02 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-10 16:58:02 -0700 |
| commit | fc6d238884f06951a413004b46569304a9d9280a (patch) | |
| tree | 106a4f3e8a3b011d34a97b215070d5cd0a96c069 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 63577b8fe3f2b46da70e373364028ae45faf4e06 (diff) | |
| parent | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (diff) | |
Default merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index c557e9b85d..ad3a5c2380 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -351,7 +351,7 @@ LLUIImagePtr LLTaskInvFVBridge::getIcon() const { const BOOL item_is_multi = (mFlags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS); - return LLInventoryIcon::getIcon(mAssetType, mInventoryType, FALSE, 0, item_is_multi ); + return LLInventoryIcon::getIcon(mAssetType, mInventoryType, 0, item_is_multi ); } void LLTaskInvFVBridge::openItem() @@ -1236,7 +1236,7 @@ public: LLUIImagePtr LLTaskWearableBridge::getIcon() const { - return LLInventoryIcon::getIcon(mAssetType, mInventoryType, FALSE, mFlags, FALSE ); + return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, FALSE ); } |