From 149d4ce795a9bcfe8d0a9d83521b94d25ca8deab Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 30 Jan 2018 09:22:23 -0500
Subject: [PATCH] remove cross-library reference (needs to be moved to newview)
---
indra/llui/llfloater.cpp | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 663d96bdd4f..2dcc62ce792 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1,5 +1,4 @@
/**
-
* @file llfloater.cpp
* @brief LLFloater base class
*
@@ -64,8 +63,6 @@
// use this to control "jumping" behavior when Ctrl-Tabbing
const S32 TABBED_FLOATER_OFFSET = 0;
-extern LLControlGroup gSavedSettings;
-
namespace LLInitParam
{
void TypeValues<LLFloaterEnums::EOpenPositioning>::declareValues()
@@ -1833,7 +1830,7 @@ void LLFloater::onClickCloseBtn(bool app_quitting)
// virtual
void LLFloater::draw()
{
- F32 alpha = getCurrentTransparency();
+ const F32 alpha = getCurrentTransparency();
// draw background
if( isBackgroundVisible() )
@@ -1848,16 +1845,6 @@ void LLFloater::draw()
LLUIImage* image = NULL;
LLColor4 color;
LLColor4 overlay_color;
- std::string help_topic;
- if (this->findHelpTopic(help_topic))
- {
- if("camera_floater" == help_topic)
- {
- alpha = llmin(LLCachedControl<F32>(gSavedSettings, "CameraOpacity"),
- LLCachedControl<F32>(gSavedSettings, "ActiveFloaterTransparency"));
- }
- }
-
if (isBackgroundOpaque())
{
// NOTE: image may not be set
--
GitLab