aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworld.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llworld.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llworld.h')
-rw-r--r--linden/indra/newview/llworld.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index d297d47..8936a58 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -170,22 +170,17 @@ private:
170 S32 mLastPacketsOut; 170 S32 mLastPacketsOut;
171 S32 mLastPacketsLost; 171 S32 mLastPacketsLost;
172 172
173 U64 mSpaceTimeUSec;
174
173 //////////////////////////// 175 ////////////////////////////
174 // 176 //
175 // Data for "Fake" objects 177 // Data for "Fake" objects
176 // 178 //
177 179
178 // Used to define the "Square" which we need to fill in
179 U32 mMinRegionX;
180 U32 mMaxRegionX;
181 U32 mMinRegionY;
182 U32 mMaxRegionY;
183
184 std::list<LLVOWater*> mHoleWaterObjects; 180 std::list<LLVOWater*> mHoleWaterObjects;
185 LLPointer<LLVOWater> mEdgeWaterObjects[8]; 181 LLPointer<LLVOWater> mEdgeWaterObjects[8];
186 182
187 LLPointer<LLViewerImage> mDefaultWaterTexturep; 183 LLPointer<LLViewerImage> mDefaultWaterTexturep;
188 U64 mSpaceTimeUSec;
189}; 184};
190 185
191 186