summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwebcontent.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-14 16:16:58 -0800
committercallum <none@none>2010-12-14 16:16:58 -0800
commit7c5d96f91efc7146b8cf6471cbc4c1dda50b9a93 (patch)
tree65297afab68c67db7d81be22de225911324f400d /indra/newview/llfloaterwebcontent.cpp
parent4f19d06341617bf219fa9ab129f516424c394ad1 (diff)
SOCIAL-383 FIX Sites with no titles do not show web address in title bar in Web Content Browser
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
-rw-r--r--indra/newview/llfloaterwebcontent.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index b4fa41e3f4..4d7c80ad6c 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -289,7 +289,11 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
else if(event == MEDIA_EVENT_NAME_CHANGED )
{
std::string page_title = self->getMediaName();
- setTitle( page_title );
+ // simulate browser behavior - title is empty, use the current URL
+ if ( page_title.length() > 0 )
+ setTitle( page_title );
+ else
+ setTitle( mCurrentURL );
}
else if(event == MEDIA_EVENT_LINK_HOVERED )
{