diff options
author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llviewerparcelmgr.h | |
parent | Second Life viewer sources 1.16.0.5 (diff) | |
download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/newview/llviewerparcelmgr.h')
-rw-r--r-- | linden/indra/newview/llviewerparcelmgr.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h index bade8ef..a10163a 100644 --- a/linden/indra/newview/llviewerparcelmgr.h +++ b/linden/indra/newview/llviewerparcelmgr.h | |||
@@ -73,12 +73,13 @@ class LLParcelSelection : public LLRefCount | |||
73 | { | 73 | { |
74 | friend class LLViewerParcelMgr; | 74 | friend class LLViewerParcelMgr; |
75 | 75 | ||
76 | protected: | ||
77 | ~LLParcelSelection(); | ||
78 | |||
76 | public: | 79 | public: |
77 | LLParcelSelection(LLParcel* parcel); | 80 | LLParcelSelection(LLParcel* parcel); |
78 | LLParcelSelection(); | 81 | LLParcelSelection(); |
79 | 82 | ||
80 | ~LLParcelSelection(); | ||
81 | |||
82 | // this can return NULL at any time, as parcel selection | 83 | // this can return NULL at any time, as parcel selection |
83 | // might have been invalidated. | 84 | // might have been invalidated. |
84 | LLParcel* getParcel() { return mParcel; } | 85 | LLParcel* getParcel() { return mParcel; } |
@@ -119,6 +120,8 @@ public: | |||
119 | LLViewerParcelMgr(); | 120 | LLViewerParcelMgr(); |
120 | ~LLViewerParcelMgr(); | 121 | ~LLViewerParcelMgr(); |
121 | 122 | ||
123 | static void cleanupGlobals(); | ||
124 | |||
122 | BOOL selectionEmpty() const; | 125 | BOOL selectionEmpty() const; |
123 | F32 getSelectionWidth() const { return F32(mEastNorth.mdV[VX] - mWestSouth.mdV[VX]); } | 126 | F32 getSelectionWidth() const { return F32(mEastNorth.mdV[VX] - mWestSouth.mdV[VX]); } |
124 | F32 getSelectionHeight() const { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); } | 127 | F32 getSelectionHeight() const { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); } |