diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
| commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
| tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/llstatusbar.cpp | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
| parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rwxr-xr-x | indra/newview/llstatusbar.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index eedb829b48..2d4b23d892 100755 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -94,16 +94,11 @@ extern S32 MENU_BAR_HEIGHT; // TODO: these values ought to be in the XML too -const S32 MENU_PARCEL_SPACING = 1; // Distance from right of menu item to parcel information const S32 SIM_STAT_WIDTH = 8; -const F32 SIM_WARN_FRACTION = 0.75f; -const F32 SIM_FULL_FRACTION = 0.98f; const LLColor4 SIM_OK_COLOR(0.f, 1.f, 0.f, 1.f); const LLColor4 SIM_WARN_COLOR(1.f, 1.f, 0.f, 1.f); const LLColor4 SIM_FULL_COLOR(1.f, 0.f, 0.f, 1.f); const F32 ICON_TIMER_EXPIRY = 3.f; // How long the balance and health icons should flash after a change. -const F32 ICON_FLASH_FREQUENCY = 2.f; -const S32 TEXT_HEIGHT = 18; static void onClickVolume(void*); |