summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjoint.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-29 16:09:27 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-29 16:09:27 -0700
commit4d1a2ef2d1d521ccdf5150f76ef5ce7597aded28 (patch)
tree12f3fef560884bd18fc65accf9d744ecf34303a0 /indra/newview/llviewerjoint.cpp
parentf553f7fd157d5f72d640cfea9cf4e4a7cc8e636c (diff)
Fix for DEV-41978 (media controls URL is incorrect after whitelist bounces webpage back).
Added LLViewerMediaImpl::getCurrentMediaURL(), which reflects the most recent url either set with navigateTo or received from the plugin via locationChanged/navigateComplete. LLViewerMediaImpl now uses this when reload() is called. LLPanelPrimMediaControls now uses getCurrentMediaURL() to get the url it displays in the URL input bar and opens with the pop-out control.
Diffstat (limited to 'indra/newview/llviewerjoint.cpp')
0 files changed, 0 insertions, 0 deletions