diff options
author | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
---|---|---|
committer | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
commit | 5754493cdcfeac76d0576abc19bdf5a03717780d (patch) | |
tree | e6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/newview/lltextureinfo.h | |
parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) |
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/newview/lltextureinfo.h')
-rw-r--r-- | indra/newview/lltextureinfo.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/lltextureinfo.h b/indra/newview/lltextureinfo.h index 03721bdd73..46378eb7f8 100644 --- a/indra/newview/lltextureinfo.h +++ b/indra/newview/lltextureinfo.h @@ -38,7 +38,7 @@ public: LLTextureInfo(bool postponeStartRecoreder = true); ~LLTextureInfo(); - void setUpLogging(bool writeToViewerLog, bool sendToSim, U32Bytes textureLogThreshold); + void setLogging(bool log_info); bool has(const LLUUID& id); void setRequestStartTime(const LLUUID& id, U64 startTime); void setRequestSize(const LLUUID& id, U32 size); @@ -61,12 +61,11 @@ private: std::map<LLUUID, LLTextureInfoDetails *> mTextures; LLSD mAverages; - bool mLogTextureDownloadsToViewerLog, - mLogTextureDownloadsToSimulator; + bool mLoggingEnabled; std::string mTextureDownloadProtocol; - U32Bytes mTextureLogThreshold; U64Microseconds mCurrentStatsBundleStartTime; LLTrace::Recording mRecording; + }; #endif // LL_LLTEXTUREINFO_H |