diff options
author | callum_linden <callum@lindenlab.com> | 2017-12-15 16:11:29 -0800 |
---|---|---|
committer | callum_linden <callum@lindenlab.com> | 2017-12-15 16:11:29 -0800 |
commit | 6ced87c0275ec20fca994f8d2f61947d5ac62082 (patch) | |
tree | a561bdf885a132d7bf16f6b86ae11837d1fb9831 /indra/newview | |
parent | 6166ab28dd43304085b23c0d35698be9d90bb8a9 (diff) |
Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' links) as well as an improvement for maint-8100 (no error message for invalid hostname / url)
Diffstat (limited to 'indra/newview')
-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. |