Second Life viewer sources 1.14.0.0

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()
                 return;
         }
 
-        if (gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolParcel)
+        if (gToolMgr->getCurrentTool() == gToolParcel)
         {
                 // selecting land, don't do anything
                 return;
@@ -301,8 +301,8 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 msg->addF32Fast(_PREHASH_Seconds, seconds);
                 msg->addF32Fast(_PREHASH_Height, mStartingZ);
 
-                BOOL parcel_selected = gParcelMgr->getWholeParcelSelected();
-                LLParcel* selected_parcel = gParcelMgr->getSelectedParcel();
+                BOOL parcel_selected = gParcelMgr->getParcelSelection()->getWholeParcelSelected();
+                LLParcel* selected_parcel = gParcelMgr->getParcelSelection()->getParcel();
 
                 if (parcel_selected && selected_parcel)
                 {
@@ -535,7 +535,7 @@ void LLToolBrushLand::onIdle( void* brush_tool )
 {
         LLToolBrushLand* self = reinterpret_cast<LLToolBrushLand*>(brush_tool);
 
-        if( gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) ) == self )
+        if( gToolMgr->getCurrentTool() == self )
         {
                 self->brush();
         }