summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-02-18 11:21:36 -0800
committerCallum Prentice <callum@lindenlab.com>2010-02-18 11:21:36 -0800
commit77009a366faeb1b1d9fd3ae9eeca55bcb011c49a (patch)
treec8ac7d3ba2d28fba0a3a6ea646228cc2d9e51d6f /indra/newview/llviewermedia.cpp
parentca6caad68c51848cb02944b387f6a6f35f8f15bc (diff)
EXT-5363 webkit does not strip spaces off a typed-in URL
Reviewed by CB
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 642f672faf..395467dffb 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1318,6 +1318,9 @@ void LLViewerMediaImpl::loadURI()
{
if(mMediaSource)
{
+ // trim whitespace from front and back of URL - fixes EXT-5363
+ LLStringUtil::trim( mMediaURL );
+
// *HACK: we don't know if the URI coming in is properly escaped
// (the contract doesn't specify whether it is escaped or not.
// but LLQtWebKit expects it to be, so we do our best to encode