diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
| commit | 84f417f9ab8167c79989337e954d5504cbd9d9e2 (patch) | |
| tree | 040923e87ca6de31cb38f77d62f34a2e940f0f77 /indra/newview/llviewermessage.cpp | |
| parent | ac52aa08862833ab243fb6afc8c20d148e02c55c (diff) | |
| parent | ec36c092a2a5995983a2dc97662c4de3e408ead4 (diff) | |
merge from viewer-trunk
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 78be6bdfd0..8e82725bb7 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; |