diff options
| author | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
| commit | ec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch) | |
| tree | 01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/llmessage/llcircuit.h | |
| parent | c2785a740eb98d28ba705c981f4b6b289501d2e5 (diff) | |
| parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) | |
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/llmessage/llcircuit.h')
| -rw-r--r-- | indra/llmessage/llcircuit.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmessage/llcircuit.h b/indra/llmessage/llcircuit.h index d1c400c6a2..430d6358f7 100644 --- a/indra/llmessage/llcircuit.h +++ b/indra/llmessage/llcircuit.h @@ -40,7 +40,6 @@ #include "llpacketack.h" #include "lluuid.h" #include "llthrottle.h" -#include "llstat.h" // // Constants @@ -126,8 +125,6 @@ public: S32 getUnackedPacketCount() const { return mUnackedPacketCount; } S32 getUnackedPacketBytes() const { return mUnackedPacketBytes; } F64 getNextPingSendTime() const { return mNextPingSendTime; } - F32 getOutOfOrderRate(LLStatAccum::TimeScale scale = LLStatAccum::SCALE_MINUTE) - { return mOutOfOrderRate.meanValue(scale); } U32 getLastPacketGap() const { return mLastPacketGap; } LLHost getHost() const { return mHost; } F64 getLastPacketInTime() const { return mLastPacketInTime; } @@ -275,7 +272,6 @@ protected: LLTimer mExistenceTimer; // initialized when circuit created, used to track bandwidth numbers S32 mCurrentResendCount; // Number of resent packets since last spam - LLStatRate mOutOfOrderRate; // Rate of out of order packets coming in. U32 mLastPacketGap; // Gap in sequence number of last packet. const F32 mHeartbeatInterval; |