diff options
author | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
---|---|---|
committer | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
commit | d04e8d757575dbb50877ef861adcfde427837bb6 (patch) | |
tree | b214237a4246e523754b356b003d1d2a163f21ab /indra/newview/llstatusbar.h | |
parent | 3172b4db1ee4d2059d2605ce616bdb10c840fc03 (diff) | |
parent | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (diff) |
merging up from viewer-development
Diffstat (limited to 'indra/newview/llstatusbar.h')
-rw-r--r-- | indra/newview/llstatusbar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index dc95e2b383..c8c86dfd8c 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -106,6 +106,8 @@ private: LLButton *mBtnVolume; LLButton *mMediaToggle; + LLView* mScriptOut; + LLFrameTimer mClockUpdateTimer; S32 mBalance; S32 mHealth; |