diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
| commit | e1e1212daae33723e7da325f295a5c3a6bb78979 (patch) | |
| tree | 95139904e71995519db2fc6e056940b2f40e73a3 /indra/newview/llworld.h | |
| parent | 41927004751731d2d0cb74989ded36878292ee4e (diff) | |
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 9dd90480b6..d65c91a6a6 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -170,22 +170,17 @@ private: S32 mLastPacketsOut; S32 mLastPacketsLost; + U64 mSpaceTimeUSec; + //////////////////////////// // // Data for "Fake" objects // - // Used to define the "Square" which we need to fill in - U32 mMinRegionX; - U32 mMaxRegionX; - U32 mMinRegionY; - U32 mMaxRegionY; - std::list<LLVOWater*> mHoleWaterObjects; LLPointer<LLVOWater> mEdgeWaterObjects[8]; LLPointer<LLViewerImage> mDefaultWaterTexturep; - U64 mSpaceTimeUSec; }; |