diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-04 08:45:49 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-04 08:45:49 -0800 |
| commit | 53fb7f9998fceadc84ee3aefec12806ce87f7772 (patch) | |
| tree | d6b573858cda30f1191c45de1366af974233957d /indra/newview/llpanelvolumepulldown.cpp | |
| parent | e79b1dfb418ad090c016eaa4d6b1388bde47c274 (diff) | |
| parent | 059b561dd2fbbc115d815a41d58b8bb76f603074 (diff) | |
merge storm-2082 changes
Diffstat (limited to 'indra/newview/llpanelvolumepulldown.cpp')
| -rwxr-xr-x | indra/newview/llpanelvolumepulldown.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp index cb00f742cc..6595da235c 100755 --- a/indra/newview/llpanelvolumepulldown.cpp +++ b/indra/newview/llpanelvolumepulldown.cpp @@ -40,8 +40,8 @@ #include "llfloaterpreference.h" #include "llsliderctrl.h" -/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 4.0f; -/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 5.0f; +/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 2.0f; +/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 3.0f; ///---------------------------------------------------------------------------- /// Class LLPanelVolumePulldown |