diff options
author | callum_linden <none@none> | 2018-01-19 15:37:27 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2018-01-19 15:37:27 -0800 |
commit | afa6c393a04ddb1b2b89a3c14a5070ac3e1f1370 (patch) | |
tree | 0285ce2613b9195392e0a85bc4e52f4e7dacb115 /indra/newview/llmediactrl.cpp | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
parent | b90a89c85be410e38ad6258430773e4492639ad4 (diff) |
After reforking the post viewer64 viewer-release repository, I pulled in all the changes from my viewer64 based viewe64-media-update repository. This repository is the canonical one going forwards
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. |