diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
| commit | f1a4593e471f4ae0e08767f73f100add683965bf (patch) | |
| tree | 0f0f42a772c9c739ee5e726a8044e2888d17b735 /indra/newview/llstatusbar.h | |
| parent | d7e6f21981b0a00c0d89096cc17bab07be60e51a (diff) | |
| parent | 50a57ba9fec0435a990338398d5c4f23c5cc91f0 (diff) | |
merge changes for vmrg-204
Diffstat (limited to 'indra/newview/llstatusbar.h')
| -rw-r--r-- | indra/newview/llstatusbar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 4ea3183d18..9d28e6c2bc 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -102,10 +102,11 @@ private: LLStatGraph *mSGBandwidth; LLStatGraph *mSGPacketLoss; + LLView *mBtnStats; LLButton *mBtnVolume; LLTextBox *mBoxBalance; LLButton *mMediaToggle; - LLView* mScriptOut; + LLView *mScriptOut; LLFrameTimer mClockUpdateTimer; S32 mBalance; |