diff options
| author | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
| commit | 433d53ea5580b2cbb17e6397afe2ca008e466963 (patch) | |
| tree | 50e13b5949d96e4ea5e0bdcb113458ad7dbbf4b4 /indra/newview/llworld.h | |
| parent | 85df1df3c34115efa0e18d116f7923b88ec1dadf (diff) | |
| parent | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (diff) | |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index f350009d10..8187142b2b 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -144,6 +144,7 @@ public: U64 getSpaceTimeUSec() const; void getInfo(LLSD& info); + U32 getNumOfActiveCachedObjects() const {return mNumOfActiveCachedObjects;} public: typedef std::list<LLViewerRegion*> region_list_t; @@ -181,7 +182,7 @@ private: S32 mLastPacketsIn; S32 mLastPacketsOut; S32 mLastPacketsLost; - + U32 mNumOfActiveCachedObjects; U64 mSpaceTimeUSec; BOOL mClassicCloudsEnabled; |