diff options
| author | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
| commit | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (patch) | |
| tree | 1f769d4c8375e23576ecb01457979deeeba34c24 /indra/newview/llpanellogin.cpp | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
| parent | 039b6baf065a87d747647fb0477c799a9949ebf2 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 4ac3a248d3..27f341b4f6 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -769,7 +769,10 @@ void LLPanelLogin::loadLoginPage() gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid()); LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html"); - web_browser->navigateTo( oStr.str(), "text/html" ); + if (web_browser->getCurrentNavUrl() != oStr.str()) + { + web_browser->navigateTo( oStr.str(), "text/html" ); + } } void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event) |