diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
| commit | 2c536cd91dcdb89319fc569f34ee49cfaccd8a5d (patch) | |
| tree | ba304e9cc5bec1caebc360618cfa39bd8c3ffdd9 /indra/newview/llmediactrl.cpp | |
| parent | 4a684fb9e27be77f7069215b597bb0e7807757b3 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
merge changes for 5.1.3-release
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. |