Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLTool Update/Sync

Browse Source 
Better diff against Alchemy.
This commit is contained in:
Inusaito Sayori
2015-01-20 04:37:32 -05:00
parent a75964c993
commit 51aaa9f26b
11 changed files with 246 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
indra/newview/lltoolbrush.cpp
View File

@@ -59,7 +59,7 @@
#include "llworld.h"
#include "llappviewer.h"
#include "llparcel.h"
#include "roles_constants.h"
#include "llglheaders.h"
const std::string REGION_BLOCKS_TERRAFORM_MSG = "This region does not allow terraforming.\n"
@@ -246,9 +246,9 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
iter != mLastAffectedRegions.end(); ++iter)
{
LLViewerRegion* regionp = *iter;
if (!canTerraform(regionp))
if (!canTerraformRegion(regionp))
{
alertNoTerraform(regionp);
alertNoTerraformRegion(regionp);
return;
}
}
@@ -383,12 +383,17 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask)
LLRegionPosition region_position( spot );
LLViewerRegion* regionp = region_position.getRegion();
if (!canTerraform(regionp))
if (!canTerraformRegion(regionp))
{
alertNoTerraform(regionp);
alertNoTerraformRegion(regionp);
return TRUE;
}
if (!canTerraformParcel(regionp))
{
alertNoTerraformParcel();
}
LLVector3 pos_region = region_position.getPositionRegion();
U32 grids = regionp->getLand().mGridsPerEdge;
S32 i = llclamp( (S32)pos_region.mV[VX], 0, (S32)grids );
@@ -408,13 +413,23 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLToolBrushLand::handleHover( S32 x, S32 y, MASK mask )
{
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolBrushLand ("
LL_DEBUGS("UserInput") << "hover handled by LLToolBrushLand ("
<< (hasMouseCapture() ? "active":"inactive")
<< ")" << llendl;
<< ")" << LL_ENDL;
mMouseX = x;
mMouseY = y;
mGotHover = TRUE;
gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLLAND);
LLVector3d spot;
if (gViewerWindow->mousePointOnLandGlobal(mMouseX, mMouseY, &spot))
{
spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
LLViewerParcelMgr::getInstance()->setHoverParcel(spot);
}
return TRUE;
}
@@ -463,7 +478,7 @@ void LLToolBrushLand::render()
{
if(mGotHover)
{
//llinfos << "LLToolBrushLand::render()" << llendl;
//LL_INFOS() << "LLToolBrushLand::render()" << LL_ENDL;
LLVector3d spot;
if(gViewerWindow->mousePointOnLandGlobal(mMouseX, mMouseY, &spot))
{
@@ -660,7 +675,7 @@ void LLToolBrushLand::redo()
}*/
// static
bool LLToolBrushLand::canTerraform(LLViewerRegion* regionp) const
bool LLToolBrushLand::canTerraformRegion(LLViewerRegion* regionp) const
{
if (!regionp) return false;
if (regionp->canManageEstate()) return true;
@@ -668,7 +683,22 @@ bool LLToolBrushLand::canTerraform(LLViewerRegion* regionp) const
}
// static
void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp)
bool LLToolBrushLand::canTerraformParcel(LLViewerRegion* regionp) const
{
LLParcel* selected_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
bool is_terraform_allowed = false;
if (selected_parcel)
{
BOOL owner_release = LLViewerParcelMgr::isParcelOwnedByAgent(selected_parcel, GP_LAND_ALLOW_EDIT_LAND);
is_terraform_allowed = ( gAgent.canManageEstate() || (selected_parcel->getOwnerID() == regionp->getOwner()) || owner_release);
}
return is_terraform_allowed;
}
// static
void LLToolBrushLand::alertNoTerraformRegion(LLViewerRegion* regionp)
{
if (!regionp) return;
@@ -678,6 +708,19 @@ void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp)
}
// static
void LLToolBrushLand::alertNoTerraformParcel()
{
LLParcel* selected_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
if (selected_parcel)
{
LLSD args;
args["PARCEL"] = selected_parcel->getName();
LLNotificationsUtil::add("ParcelNoTerraforming", args);
}
}
///============================================================================
/// Local function definitions
///============================================================================