diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
commit | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (patch) | |
tree | a09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/llstatusbar.h | |
parent | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (diff) |
Backed out changeset f34a69c2af56
(this backs-out my backout, now that I'm happy the original merge works okay :))
Diffstat (limited to 'indra/newview/llstatusbar.h')
-rw-r--r-- | indra/newview/llstatusbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index f77cc1acb8..0e98da0fe4 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -112,7 +112,7 @@ private: S32 mSquareMetersCommitted; LLFrameTimer* mBalanceTimer; LLFrameTimer* mHealthTimer; - + LLPanelVolumePulldown* mPanelVolumePulldown; static std::vector<std::string> sDays; static std::vector<std::string> sMonths; static const U32 MAX_DATE_STRING_LENGTH; |