diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2017-02-23 17:50:36 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2017-02-23 17:50:36 -0500 |
| commit | 5c4ae5b11a44ab4711f0148cb721f35be9f18100 (patch) | |
| tree | 63547de0e485eda85168600962798467062731d3 /indra/llui | |
| parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
STORM-2145 Camera Presets -- some initial work
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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 |