diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llviewerparcelmgr.h | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index 879ce2dd8a..20c6b6895d 100644 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -53,12 +53,13 @@ class LLParcelSelection : public LLRefCount { friend class LLViewerParcelMgr; +protected: + ~LLParcelSelection(); + public: LLParcelSelection(LLParcel* parcel); LLParcelSelection(); - ~LLParcelSelection(); - // this can return NULL at any time, as parcel selection // might have been invalidated. LLParcel* getParcel() { return mParcel; } @@ -99,6 +100,8 @@ public: LLViewerParcelMgr(); ~LLViewerParcelMgr(); + static void cleanupGlobals(); + BOOL selectionEmpty() const; F32 getSelectionWidth() const { return F32(mEastNorth.mdV[VX] - mWestSouth.mdV[VX]); } F32 getSelectionHeight() const { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); } |