summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-09-26 16:17:54 -0700
committerMerov Linden <merov@lindenlab.com>2013-09-26 16:17:54 -0700
commit796be733b374beb5660ee2713fc28c4e69331cbd (patch)
tree4a3c4f6c158836e585e4e8e83ac47bb9586edc43
parentf53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff)
ACME-946 : Do not force set the focus on the web element, that messes things up badly...
-rwxr-xr-xindra/newview/llfloaterwebcontent.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 9d703d2752..5c569b9bf0 100755
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -253,11 +253,6 @@ void LLFloaterWebContent::open_media(const Params& p)
getChildView("address")->setEnabled(address_entry_enabled);
getChildView("popexternal")->setEnabled(address_entry_enabled);
- if (!address_entry_enabled)
- {
- mWebBrowser->setFocus(TRUE);
- }
-
if (!p.show_chrome)
{
setResizeLimits(100, 100);
@@ -434,9 +429,6 @@ void LLFloaterWebContent::set_current_url(const std::string& url)
mAddressCombo->remove(mCurrentURL);
mAddressCombo->add(mDisplayURL);
mAddressCombo->selectByValue(mDisplayURL);
-
- // Set the focus back to the web page. When setting the url, there's no point to leave the focus anywhere else.
- mWebBrowser->setFocus(TRUE);
}
}