From 5c4ae5b11a44ab4711f0148cb721f35be9f18100 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 23 Feb 2017 17:50:36 -0500
Subject: STORM-2145 Camera Presets -- some initial work

---
 indra/llui/llfloater.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4f664a1ccc..8b0e19e4f6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1839,7 +1839,7 @@ void LLFloater::onClickCloseBtn(bool app_quitting)
 // virtual
 void LLFloater::draw()
 {
-	const F32 alpha = getCurrentTransparency();
+	F32 alpha = getCurrentTransparency();
 
 	// draw background
 	if( isBackgroundVisible() )
@@ -1854,6 +1854,16 @@ 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
-- 
cgit v1.2.3