diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-13 16:30:08 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-13 16:30:08 +0100 |
| commit | abec5d6c9b72f1d22c97593d682106e58e241aa6 (patch) | |
| tree | 5a26680da2f4305f35a953af7c69bbed571bbcc5 /indra/newview/llmediactrl.cpp | |
| parent | f7134144a6ed8f5710d02a84ad3ad5dc29cb0bd5 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
merge, mac build fix
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index a8025906c7..7f6955d08c 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1022,7 +1022,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) // try as slurl first if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted)) { - LLWeb::loadURL(url, target, std::string()); + LLWeb::loadURL(url, target, uuid); } // CP: removing this code because we no longer support popups so this breaks the flow. |