diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerparcelmgr.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h index 5847343..319bbc6 100644 --- a/linden/indra/newview/llviewerparcelmgr.h +++ b/linden/indra/newview/llviewerparcelmgr.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "llframetimer.h" | 37 | #include "llframetimer.h" |
38 | #include "llmemory.h" | 38 | #include "llmemory.h" |
39 | #include "llparcelselection.h" | 39 | #include "llparcelselection.h" |
40 | #include "llui.h" | ||
40 | 41 | ||
41 | class LLUUID; | 42 | class LLUUID; |
42 | class LLMessageSystem; | 43 | class LLMessageSystem; |
@@ -73,8 +74,7 @@ public: | |||
73 | virtual void changed() = 0; | 74 | virtual void changed() = 0; |
74 | }; | 75 | }; |
75 | 76 | ||
76 | 77 | class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr> | |
77 | class LLViewerParcelMgr | ||
78 | { | 78 | { |
79 | 79 | ||
80 | public: | 80 | public: |
@@ -325,15 +325,14 @@ private: | |||
325 | BOOL mRenderSelection; | 325 | BOOL mRenderSelection; |
326 | S32 mCollisionBanned; | 326 | S32 mCollisionBanned; |
327 | LLFrameTimer mCollisionTimer; | 327 | LLFrameTimer mCollisionTimer; |
328 | LLUUID mBlockedImageID; | 328 | LLImageGL* mBlockedImage; |
329 | LLUUID mPassImageID; | 329 | LLImageGL* mPassImage; |
330 | 330 | ||
331 | // Media | 331 | // Media |
332 | S32 mMediaParcelId; | 332 | S32 mMediaParcelId; |
333 | U64 mMediaRegionId; | 333 | U64 mMediaRegionId; |
334 | }; | 334 | }; |
335 | 335 | ||
336 | extern LLViewerParcelMgr *gParcelMgr; | ||
337 | 336 | ||
338 | void sanitize_corners(const LLVector3d &corner1, const LLVector3d &corner2, | 337 | void sanitize_corners(const LLVector3d &corner1, const LLVector3d &corner2, |
339 | LLVector3d &west_south_bottom, LLVector3d &east_north_top); | 338 | LLVector3d &west_south_bottom, LLVector3d &east_north_top); |