Anonymous avatar Anonymous committed 6f63bcb

EXP-880 FIX Disable address bar copy menu and open in external browser button
when using trusted browser or explicitly disabling address bar

Comments (0)

Files changed (1)

indra/newview/llfloaterwebcontent.cpp

 	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)
 	{
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.