aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolbrush.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolbrush.cpp')
-rw-r--r--linden/indra/newview/lltoolbrush.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 1822c63..210a1e7 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -182,7 +182,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
182 return; 182 return;
183 } 183 }
184 184
185 if (gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolParcel) 185 if (gToolMgr->getCurrentTool() == gToolParcel)
186 { 186 {
187 // selecting land, don't do anything 187 // selecting land, don't do anything
188 return; 188 return;
@@ -301,8 +301,8 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
301 msg->addF32Fast(_PREHASH_Seconds, seconds); 301 msg->addF32Fast(_PREHASH_Seconds, seconds);
302 msg->addF32Fast(_PREHASH_Height, mStartingZ); 302 msg->addF32Fast(_PREHASH_Height, mStartingZ);
303 303
304 BOOL parcel_selected = gParcelMgr->getWholeParcelSelected(); 304 BOOL parcel_selected = gParcelMgr->getParcelSelection()->getWholeParcelSelected();
305 LLParcel* selected_parcel = gParcelMgr->getSelectedParcel(); 305 LLParcel* selected_parcel = gParcelMgr->getParcelSelection()->getParcel();
306 306
307 if (parcel_selected && selected_parcel) 307 if (parcel_selected && selected_parcel)
308 { 308 {
@@ -535,7 +535,7 @@ void LLToolBrushLand::onIdle( void* brush_tool )
535{ 535{
536 LLToolBrushLand* self = reinterpret_cast<LLToolBrushLand*>(brush_tool); 536 LLToolBrushLand* self = reinterpret_cast<LLToolBrushLand*>(brush_tool);
537 537
538 if( gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) ) == self ) 538 if( gToolMgr->getCurrentTool() == self )
539 { 539 {
540 self->brush(); 540 self->brush();
541 } 541 }