diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-02-02 18:28:14 +0000 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-02-02 18:28:14 +0000 |
commit | 76a2966b4d198358a0d8a6f385a85ec8a9a61492 (patch) | |
tree | 4c086510604803fdcafd59e07ec7aba7f0636fdd /indra/newview | |
parent | 7764d9d29177ca19a3342ec571fa00a7a0869dfa (diff) |
MAINT-3884 Fixed viewer sends multiple GET requests against prim media
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7b4d8ef329..2bfdf0790e 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2525,7 +2525,9 @@ void LLVOVolume::mediaNavigateBounceBack(U8 texture_index) LL_WARNS("MediaOnAPrim") << "FAILED to bounce back URL \"" << url << "\" -- unloading impl" << LL_ENDL; impl->setMediaFailed(true); } - else { + // Make sure we are not bouncing to url we came from + else if (impl->getCurrentMediaURL() != url) + { // Okay, navigate now LL_INFOS("MediaOnAPrim") << "bouncing back to URL: " << url << LL_ENDL; impl->navigateTo(url, "", false, true); |