diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
| commit | cda5666dc765c4988b4f01ab34b8a008039ae261 (patch) | |
| tree | 06c00e15896998d373810465d8eb161358dcb340 /indra/newview/llworld.h | |
| parent | 27bec2b2f21f19a7c04707b03f83c8caa855872d (diff) | |
| parent | 7cc37d949e9319a5b60641ff8453a0fed763d817 (diff) | |
Automated merge with https://hg.lindenlab.com/richard/viewer-interesting
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; |