summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-07 17:26:20 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-07 17:26:20 -0700
commitf343395f461fa7fddaecb91d2231551b70965f50 (patch)
tree87bc2af6dd669cd594db7ac06dc15474a49f21d6 /indra/newview
parentc69ead589528cfec2158d61c10e0fcb1d3e57ef0 (diff)
Don't set the nav state to MEDIANAVSTATE_NONE in response to MEDIA_EVENT_NAVIGATE_COMPLETE. Doing so was breaking the bounceback code.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 60b3af5ca1..67c198d3b9 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1441,7 +1441,6 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
case LLViewerMediaObserver::MEDIA_EVENT_NAVIGATE_COMPLETE:
{
LL_DEBUGS("Media") << "MEDIA_EVENT_NAVIGATE_COMPLETE, uri is: " << plugin->getNavigateURI() << LL_ENDL;
- setNavState(MEDIANAVSTATE_NONE);
}
break;