diff options
| author | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
| commit | 17c051f965e05a8a91d4a93b641084869897fe71 (patch) | |
| tree | 1227bfab5e2039b2d78061adbd549e8481ce4fdc /indra/newview/llworld.h | |
| parent | 62a9f557d2e91beb685843775e8f9fe73dab4b94 (diff) | |
| parent | efa6be575c184a885d2b7e6f2142db6777668343 (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; |