diff options
| author | James Cook <james@lindenlab.com> | 2007-09-21 20:07:49 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-09-21 20:07:49 +0000 |
| commit | 7f9aa65bfb03113f886ecf216bc01fcfd15f86a5 (patch) | |
| tree | 8eab3e42dc62db935a73ab8e30664e750a82765c /indra/newview/llfloaterlagmeter.h | |
| parent | 99d1eb7261e6fa21c9b30a3c0fb256029481db42 (diff) | |
svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view, icon layout and ping time testing. QA passed by Devin.
Diffstat (limited to 'indra/newview/llfloaterlagmeter.h')
| -rw-r--r-- | indra/newview/llfloaterlagmeter.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h index 72766fec85..2bf0cdb9e3 100644 --- a/indra/newview/llfloaterlagmeter.h +++ b/indra/newview/llfloaterlagmeter.h @@ -27,7 +27,7 @@ private: static void onClickShrink(void * data); - bool mMinimized; + bool mShrunk; S32 mMaxWidth, mMinWidth; F32 mClientFrameTimeCritical; @@ -38,6 +38,8 @@ private: F32 mNetworkPacketLossCritical; F32 mNetworkPacketLossWarning; + F32 mNetworkPingCritical; + F32 mNetworkPingWarning; LLButton * mNetworkButton; LLTextBox * mNetworkText; LLTextBox * mNetworkCause; |