diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-29 15:24:09 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-29 15:24:09 +0300 |
| commit | 7d0769f3e1979d12b8cf55e0f5312fecade49bee (patch) | |
| tree | bc35fbf959a358315358722943a4bfd7b213850c /indra/newview/llviewermessage.cpp | |
| parent | 4eb741883cbee15e28272677bcb9b58dce85ee42 (diff) | |
| parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3d042a8d8c..5dd9623955 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1091,7 +1091,7 @@ void open_inventory_offer(const uuid_vec_t& items, const std::string& from_name) //////////////////////////////////////////////////////////////////////////////// // Special handling for various types. - const LLAssetType::EType asset_type = item->getType(); + const LLAssetType::EType asset_type = item->getActualType(); if (check_offer_throttle(from_name, false)) // If we are throttled, don't display { LL_DEBUGS("Messaging") << "Highlighting inventory item: " << item->getUUID() << LL_ENDL; |