diff options
author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/lltoolselectland.cpp | |
parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/lltoolselectland.cpp')
-rw-r--r-- | indra/newview/lltoolselectland.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp index 7d51d4a81c..f64bf6bf2d 100644 --- a/indra/newview/lltoolselectland.cpp +++ b/indra/newview/lltoolselectland.cpp @@ -46,6 +46,10 @@ LLToolSelectLand::LLToolSelectLand( ) mLastShowParcelOwners(FALSE) { } +LLToolSelectLand::~LLToolSelectLand() +{ +} + BOOL LLToolSelectLand::handleMouseDown(S32 x, S32 y, MASK mask) { @@ -114,7 +118,7 @@ BOOL LLToolSelectLand::handleMouseUp(S32 x, S32 y, MASK mask) roundXY(mEastNorthTop); // Don't auto-select entire parcel. - gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE ); + mSelection = gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE ); } mMouseOutsideSlop = FALSE; @@ -201,6 +205,7 @@ void LLToolSelectLand::handleSelect() void LLToolSelectLand::handleDeselect() { gFloaterTools->setStatusText(""); + mSelection = NULL; //gParcelMgr->deselectLand(); gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners); } |