STORM-2145 Camera controls opacity is now working

3 files changed, 13 insertions, 1 deletions

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 550bee5c70..e53ecd30c2 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -212,7 +212,8 @@ public:
 
 	virtual void	setColor(const LLColor4& color);
 
-	F32 			getCurrentTransparency();
+	// Ansariel: Changed to virtual. We might want to change the transparency ourself!
+	virtual F32	getCurrentTransparency();
 
 	void				setTransparencyType(ETypeTransparency type);
 	ETypeTransparency	getTransparencyType() const {return mTransparencyType;}
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 5bebebf21f..c12ccb386e 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -378,6 +378,15 @@ BOOL LLFloaterCamera::postBuild()
 	return LLFloater::postBuild();
 }
 
+F32	LLFloaterCamera::getCurrentTransparency()
+{
+
+	static LLCachedControl<F32> camera_opacity(gSavedSettings, "CameraOpacity");
+	static LLCachedControl<F32> active_floater_transparency(gSavedSettings, "ActiveFloaterTransparency");
+	return llmin(camera_opacity(), active_floater_transparency());
+
+}
+
 void LLFloaterCamera::onViewButtonClick(const LLSD& user_data)
 {
 	// bring up the prefs floater
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 3601813bc1..481e9aec1b 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -91,6 +91,8 @@ private:
 
 	/*virtual*/ BOOL postBuild();
 
+	F32 getCurrentTransparency();
+
 	void onViewButtonClick(const LLSD& user_data);
 
 	ECameraControlMode determineMode();