diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
| commit | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (patch) | |
| tree | 5c73fc1f5275df0c5546f2bc1dc85e0f4e83e40f /indra/newview/llviewermessage.cpp | |
| parent | becfbd2b8295e3007fe151cd9b69d0af139040e2 (diff) | |
| parent | a27706ad2e42718ad107e25fe7c29f1c0513fabc (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef6a621323..11b2f07f1b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -939,6 +939,11 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name) !from_name.empty()) { view = LLFloaterInventory::showAgentInventory(); + //TODO:this should be moved to the end of method after all the checks, + //but first decide what to do with active inventory if any (EK) + LLSD key; + key["select"] = item->getUUID(); + LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } else { |