diff options
| author | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
| commit | e28007f830a85b94adb7b787f18047780ac026ff (patch) | |
| tree | 2f72c0a29dadea66d95ac7ac6646b93311b85a9c /indra/newview/llworld.h | |
| parent | 8c73ff245cee8da2ca75c5651be88a36358a5dae (diff) | |
| parent | beb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (diff) | |
Automated merge with file:///d:%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; |