diff options
Diffstat (limited to 'indra/newview/llworld.h')
-rwxr-xr-x | indra/newview/llworld.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index d0b001ba44..c74ac3fa6f 100755 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -141,10 +141,11 @@ public: void waterHeightRegionInfo(std::string const& sim_name, F32 water_height); void shiftRegions(const LLVector3& offset); - void setSpaceTimeUSec(const U64 space_time_usec); - U64 getSpaceTimeUSec() const; + void setSpaceTimeUSec(const LLUnitImplicit<U64, LLUnits::Microseconds> space_time_usec); + LLUnitImplicit<U64, LLUnits::Microseconds> getSpaceTimeUSec() const; void getInfo(LLSD& info); + U32 getNumOfActiveCachedObjects() const {return mNumOfActiveCachedObjects;} public: typedef std::list<LLViewerRegion*> region_list_t; @@ -187,8 +188,8 @@ private: S32 mLastPacketsIn; S32 mLastPacketsOut; S32 mLastPacketsLost; - - U64 mSpaceTimeUSec; + U32 mNumOfActiveCachedObjects; + LLUnitImplicit<U64, LLUnits::Microseconds> mSpaceTimeUSec; BOOL mClassicCloudsEnabled; |