diff options
author | Jacek Antonelli | 2008-08-15 23:45:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:54 -0500 |
commit | d0b03a62fd799317d5da0bd56615739ce3b5b052 (patch) | |
tree | 8bc79bbbb52e18294f62810d9fa66ce136f90e2d /linden/indra/newview/lltoolbrush.cpp | |
parent | Second Life viewer sources 1.20.8 (diff) | |
download | meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.zip meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.gz meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.bz2 meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.xz |
Second Life viewer sources 1.20.9
Diffstat (limited to 'linden/indra/newview/lltoolbrush.cpp')
-rw-r--r-- | linden/indra/newview/lltoolbrush.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp index 9958d50..89cb0b6 100644 --- a/linden/indra/newview/lltoolbrush.cpp +++ b/linden/indra/newview/lltoolbrush.cpp | |||
@@ -94,7 +94,6 @@ LLToolBrushLand::LLToolBrushLand() | |||
94 | mMouseX( 0 ), | 94 | mMouseX( 0 ), |
95 | mMouseY(0), | 95 | mMouseY(0), |
96 | mGotHover(FALSE), | 96 | mGotHover(FALSE), |
97 | mLastShowParcelOwners(FALSE), | ||
98 | mBrushSelected(FALSE) | 97 | mBrushSelected(FALSE) |
99 | { | 98 | { |
100 | mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize"); | 99 | mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize"); |
@@ -104,7 +103,8 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global, | |||
104 | MASK mask) | 103 | MASK mask) |
105 | { | 104 | { |
106 | S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction"); | 105 | S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction"); |
107 | 106 | ||
107 | mLastAffectedRegions.clear(); | ||
108 | determineAffectedRegions(mLastAffectedRegions, pos_global); | 108 | determineAffectedRegions(mLastAffectedRegions, pos_global); |
109 | for(region_list_t::iterator iter = mLastAffectedRegions.begin(); | 109 | for(region_list_t::iterator iter = mLastAffectedRegions.begin(); |
110 | iter != mLastAffectedRegions.end(); ++iter) | 110 | iter != mLastAffectedRegions.end(); ++iter) |
@@ -418,8 +418,6 @@ void LLToolBrushLand::handleSelect() | |||
418 | gFloaterTools->setStatusText("modifyland"); | 418 | gFloaterTools->setStatusText("modifyland"); |
419 | // if (!mBrushSelected) | 419 | // if (!mBrushSelected) |
420 | { | 420 | { |
421 | mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners"); | ||
422 | gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners); | ||
423 | mBrushSelected = TRUE; | 421 | mBrushSelected = TRUE; |
424 | } | 422 | } |
425 | } | 423 | } |
@@ -431,8 +429,6 @@ void LLToolBrushLand::handleDeselect() | |||
431 | { | 429 | { |
432 | gEditMenuHandler = NULL; | 430 | gEditMenuHandler = NULL; |
433 | } | 431 | } |
434 | mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners"); | ||
435 | gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners); | ||
436 | LLViewerParcelMgr::getInstance()->setSelectionVisible(TRUE); | 432 | LLViewerParcelMgr::getInstance()->setSelectionVisible(TRUE); |
437 | mBrushSelected = FALSE; | 433 | mBrushSelected = FALSE; |
438 | } | 434 | } |