diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:15 +0300 |
| commit | 8b5fe507a439c73ac22fdd71c4083d42cf351d79 (patch) | |
| tree | b80f82c4fff09e104d15a4bf8735c5622e134871 /indra/newview/llfloaterhandler.cpp | |
| parent | 3c40a833ef20bde5ccea56ce5c9ada0b28aeb57c (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to 'indra/newview/llfloaterhandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterhandler.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp index e2160498e9..8ebb14149c 100644 --- a/indra/newview/llfloaterhandler.cpp +++ b/indra/newview/llfloaterhandler.cpp @@ -26,6 +26,7 @@ #include "llfloater.h" #include "llmediactrl.h" +#include "llfloaterreg.h" // register with dispatch via global object LLFloaterHandler gFloaterHandler; @@ -50,9 +51,15 @@ LLFloater* get_parent_floater(LLView* view) bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, LLMediaCtrl *web) { - if (params.size() < 2) return false; + if (params.size() < 1) return false; LLFloater* floater = NULL; // *TODO: implement floater lookup by name + + if (params[0].asString() == "destinations") + { + LLFloaterReg::toggleInstanceOrBringToFront("destinations"); + return true; + } if (params[0].asString() == "self") { if (web) |