diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-18 10:16:55 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-18 10:16:55 +0000 |
| commit | 4d3421fe1b147179af7e71a28421b08a6032e709 (patch) | |
| tree | 3d150ec1a6ff8cb0379a10503b58bb9c0de37561 /indra | |
| parent | 798e33767f89bac520d6598259f003680d64d4da (diff) | |
EXT-4462: Support secondlife:///app/inventory/show
Opens the user's inventory in the side panel.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 5605f425e0..8781c46796 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -44,6 +44,7 @@ #include "llconsole.h" #include "llinventorymodel.h" #include "llgesturemgr.h" +#include "llsidetray.h" #include "llinventorybridge.h" #include "llfloaterinventory.h" @@ -72,7 +73,23 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { - if (params.size() < 2) return false; + if (params.size() < 1) + { + return false; + } + + // support secondlife:///app/inventory/show + if (params[0].asString() == "show") + { + LLSideTray::getInstance()->showPanel("sidepanel_inventory", LLSD()); + return true; + } + + // otherwise, we need a UUID and a verb... + if (params.size() < 2) + { + return false; + } LLUUID inventory_id; if (!inventory_id.set(params[0], FALSE)) { |