livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset 18b2e8ff915d (FIRE-16112) as per mail from Oz unless it is stated otherwise

meow-7.2.2
Ansariel 2015-06-29 08:42:23 +02:00
parent 8987989ec1
commit 9b9a688dd4
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterland.cpp
View File

@ -2134,7 +2134,7 @@ void LLPanelLandOptions::refresh()
else
{
// something selected, hooray!
//LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); // <FS:LO> FIRE-16112 fix
LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
// Display options
BOOL can_change_options = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS);
@ -2150,7 +2150,7 @@ void LLPanelLandOptions::refresh()
mCheckGroupObjectEntry ->set( parcel->getAllowGroupObjectEntry() || parcel->getAllowAllObjectEntry());
mCheckGroupObjectEntry ->setEnabled( can_change_options && !parcel->getAllowAllObjectEntry() );
//BOOL region_damage = regionp ? regionp->getAllowDamage() : FALSE; // <FS:LO> FIRE-16112 fix
BOOL region_damage = regionp ? regionp->getAllowDamage() : FALSE;
// <FS:WF> FIRE-6604 : Reinstate the "Allow Other Residents to Edit Terrain" option in About Land
BOOL can_change_terraform = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_EDIT);
@ -2159,10 +2159,7 @@ void LLPanelLandOptions::refresh()
// <FS:WF>
mCheckSafe ->set( !parcel->getAllowDamage() );
// <FS:LO> FIRE-16112 fix
//mCheckSafe ->setEnabled( can_change_options && region_damage );
mCheckSafe ->setEnabled( can_change_options );
// </FS:LO>
mCheckSafe ->setEnabled( can_change_options && region_damage );
mCheckFly ->set( parcel->getAllowFly() );
mCheckFly ->setEnabled( can_change_options );
@ -2248,7 +2245,6 @@ void LLPanelLandOptions::refresh()
// they can see the checkbox, but its disposition depends on the
// state of the region
LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); // <FS:LO> FIRE-16112 fix
if (regionp)
{
if (regionp->getSimAccess() == SIM_ACCESS_PG)

3
indra/newview/llviewerparcelmgr.cpp
View File

@ -754,8 +754,7 @@ bool LLViewerParcelMgr::allowAgentScripts(const LLViewerRegion* region, const LL
bool LLViewerParcelMgr::allowAgentDamage(const LLViewerRegion* region, const LLParcel* parcel) const
{
return (region && region->getAllowDamage())
//&& (parcel && parcel->getAllowDamage());
|| (parcel && parcel->getAllowDamage()); // <FS:LO> FIRE-16112 fix
&& (parcel && parcel->getAllowDamage());
}
BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const