From 008d95535f67dd91c05da4c191ddf59fcc85973f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Aug 2011 13:32:46 -0700
Subject: [PATCH] EXP-880 FIX Disable address bar copy menu and open in
external browser button when using trusted browser or explicitly disabling
address bar
---
indra/newview/llfloaterwebcontent.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 03e90a3d27..2c9a736aff 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -229,10 +229,8 @@ void LLFloaterWebContent::open_media(const Params& p)
getChild<LLLayoutPanel>("status_bar")->setVisible(p.show_chrome);
getChild<LLLayoutPanel>("nav_controls")->setVisible(p.show_chrome);
bool address_entry_enabled = p.allow_address_entry && !p.trusted_content;
- // disable components of combo box so that we can still select and copy text from address bar (a disabled line editor still allows this, but not if its parent is disabled)
- getChildView("address")->getChildView("Combo Text Entry")->setEnabled(address_entry_enabled);
- getChildView("address")->getChildView("Combobox Button")->setEnabled(address_entry_enabled);
- getChildView("address")->getChildView("ComboBox")->setEnabled(address_entry_enabled);
+ getChildView("address")->setEnabled(address_entry_enabled);
+ getChildView("popexternal")->setEnabled(address_entry_enabled);
if (!address_entry_enabled)
{
--
GitLab