diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llstatusbar.h | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llstatusbar.h')
| -rw-r--r-- | indra/newview/llstatusbar.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index e588519eb4..88a97ba71a 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -71,14 +71,12 @@ class LLStatusBar { public: LLStatusBar(const std::string& name, const LLRect& rect ); - ~LLStatusBar(); - virtual BOOL postBuild(); + /*virtual*/ ~LLStatusBar(); - virtual EWidgetType getWidgetType() const; - virtual LLString getWidgetTag() const; + /*virtual*/ EWidgetType getWidgetType() const; + /*virtual*/ LLString getWidgetTag() const; - // OVERRIDES - virtual void draw(); + /*virtual*/ void draw(); // MANIPULATORS void setBalance(S32 balance); @@ -104,20 +102,20 @@ public: S32 getSquareMetersLeft() const; cLLRegionDetails mRegionDetails; -protected: +private: // simple method to setup the part that holds the date void setupDate(); -protected: + static void onCommitSearch(LLUICtrl*, void* data); + static void onClickSearch(void* data); + +private: LLTextBox *mTextBalance; LLTextBox *mTextHealth; LLTextBox *mTextTime; LLTextBox* mTextParcelName; - LLStatGraph *mSGBandwidth; - LLStatGraph *mSGPacketLoss; - LLButton *mBtnBuyCurrency; S32 mBalance; |