diff options
| author | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
| commit | c03e366a6022d13fcf7b7e502daff8c72f7b64ee (patch) | |
| tree | 6f92e21824332b5357f8befe4c978b83dbaa1aef /indra/newview/lltexturefetch.h | |
| parent | 27de692bd7b297c9cd0fd6abcdee4b3e2486ec52 (diff) | |
| parent | 11e14cd3b0f58225a96b9b7a9839a7f030fe4045 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rwxr-xr-x | indra/newview/lltexturefetch.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 7fc58e230c..38272b40dc 100755 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -107,10 +107,10 @@ public: bool receiveImagePacket(const LLHost& host, const LLUUID& id, U16 packet_num, U16 data_size, U8* data); // Threads: T* (but not safe) - void setTextureBandwidth(F32 bandwidth) { mTextureBandwidth = bandwidth; } + void setTextureBandwidth(LLUnit<F32, LLUnits::Kibibits> bandwidth) { mTextureBandwidth = bandwidth; } // Threads: T* (but not safe) - F32 getTextureBandwidth() { return mTextureBandwidth; } + LLUnit<F32, LLUnits::Kibibits> getTextureBandwidth() { return mTextureBandwidth; } // Threads: T* BOOL isFromLocalCache(const LLUUID& id); @@ -309,8 +309,8 @@ private: LLMutex mQueueMutex; //to protect mRequestMap and mCommands only LLMutex mNetworkQueueMutex; //to protect mNetworkQueue, mHTTPTextureQueue and mCancelQueue. - static LLTrace::SampleStatHandle<> sCacheHitRate; - static LLTrace::SampleStatHandle<> sCacheReadLatency; + static LLTrace::EventStatHandle<LLUnit<F32, LLUnits::Percent> > sCacheHitRate; + static LLTrace::EventStatHandle<LLUnit<F64, LLUnits::Milliseconds> > sCacheReadLatency; LLTextureCache* mTextureCache; LLImageDecodeThread* mImageDecodeThread; @@ -325,8 +325,8 @@ private: queue_t mHTTPTextureQueue; // Mfnq typedef std::map<LLHost,std::set<LLUUID> > cancel_queue_t; cancel_queue_t mCancelQueue; // Mfnq - F32 mTextureBandwidth; // <none> - F32 mMaxBandwidth; // Mfnq + LLUnit<F32, LLUnits::Kibibits> mTextureBandwidth; // <none> + LLUnit<F32, LLUnits::Kibibits> mMaxBandwidth; // Mfnq LLTextureInfo mTextureInfo; // XXX possible delete |