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

Bulk of server-baking impelmentation and a bit of cleanup.

Browse Source
This commit is contained in:
Shyotl
2013-01-13 02:37:12 -06:00
parent c9954cf14e
commit e622e03d2a
104 changed files with 3804 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterland.cpp
View File

@@ -519,7 +519,7 @@ void LLPanelLandGeneral::refresh()
BOOL is_leased = (LLParcel::OS_LEASED == parcel->getOwnershipStatus());
BOOL region_xfer = FALSE;
if(regionp
&& !(regionp->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL))
&& !regionp->getRegionFlag(REGION_FLAGS_BLOCK_LAND_RESELL))
{
region_xfer = TRUE;
}
@@ -2186,7 +2186,7 @@ void LLPanelLandOptions::refreshSearch()
LLViewerParcelMgr::isParcelModifiableByAgent(
parcel, GP_LAND_CHANGE_IDENTITY)
&& region
&& !(region->getRegionFlags() & REGION_FLAGS_BLOCK_PARCEL_SEARCH);
&& !(region->getRegionFlag(REGION_FLAGS_BLOCK_PARCEL_SEARCH));
// There is a bug with this panel whereby the Show Directory bit can be
// slammed off by the Region based on an override. Since this data is cached
@@ -2383,7 +2383,7 @@ void LLPanelLandOptions::onClickPublishHelp(void*)
bool can_change_identity = region && parcel ?
LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_IDENTITY) &&
! (region->getRegionFlags() & REGION_FLAGS_BLOCK_PARCEL_SEARCH) : false;
!region->getRegionFlag(REGION_FLAGS_BLOCK_PARCEL_SEARCH) : false;
if(! can_change_identity)
{
@@ -2954,7 +2954,7 @@ void LLPanelLandCovenant::refresh()
LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
if (resellable_clause)
{
if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
if (region->getRegionFlag(REGION_FLAGS_BLOCK_LAND_RESELL))
{
resellable_clause->setText(getString("can_not_resell"));
}
@@ -2967,7 +2967,7 @@ void LLPanelLandCovenant::refresh()
LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");
if (changeable_clause)
{
if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
if (region->getRegionFlag(REGION_FLAGS_ALLOW_PARCEL_CHANGES))
{
changeable_clause->setText(getString("can_change"));
}