diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 22:15:17 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 22:15:17 -0500 |
commit | cb88b7f4a41f66249129eaa9b173ec8c206a3958 (patch) | |
tree | 96258622b06d8c79eddfc2339d2b0323377521b1 /indra/newview/llviewerinventory.cpp | |
parent | 7ce49586881fd078ea8bceeab558b4a156b30f63 (diff) | |
parent | c130f5d4c9ea6ffb423f05d965168d10c6c99c05 (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r-- | indra/newview/llviewerinventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 03e15c7ee5..9856cb2b7f 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -85,7 +85,8 @@ public: { std::vector<LLUUID> items_to_open; items_to_open.push_back(inventory_id); - open_inventory_offer(items_to_open, ""); + //inventory_handler is just a stub, because we don't know from who this offer + open_inventory_offer(items_to_open, "inventory_handler"); return true; } |