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

Add support for two non-SL grid features/flags.

Browse Source 
Adds support for GamingData cap, and flags: PF_GAMING, DFQ_FILTER_GAMING, REGION_FLAGS_GAMING, and REGION_FLAGS_HIDE_FROM_SEARCH
Adds GamingCheck to floater_about_land.xml
Adds filter_gaming checkboxes to floater_directory* xmls
Adds "is gaming" and "hide from search" checkboxes to floater_god_tools.xml
This commit is contained in:
Lirusaito
2013-02-11 01:14:09 -05:00
parent cff7a2a464
commit 1d4858ae85
21 changed files with 190 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloatergodtools.cpp
View File

@@ -461,6 +461,10 @@ BOOL LLPanelRegionTools::postBuild()
getChild<LLUICtrl>("block terraform")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
getChild<LLUICtrl>("allow transfer")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
getChild<LLUICtrl>("is sandbox")->setCommitCallback( boost::bind(&LLPanelRegionTools::onChangeAnything, this));
getChild<LLUICtrl>("is gaming")->setVisible(!gAgent.getRegion()->getCapability("GamingData").empty());
getChild<LLUICtrl>("is gaming")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
getChild<LLUICtrl>("hide from search")->setVisible(!gHippoGridManager->getConnectedGrid()->isSecondLife());
getChild<LLUICtrl>("hide from search")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
childSetAction("Bake Terrain", boost::bind(&LLPanelRegionTools::onBakeTerrain, this));
childSetAction("Revert Terrain", boost::bind(&LLPanelRegionTools::onRevertTerrain, this));
@@ -670,6 +674,14 @@ U64 LLPanelRegionTools::getRegionFlags() const
{
flags |= REGION_FLAGS_SANDBOX;
}
if (getChild<LLUICtrl>("is gaming")->getValue().asBoolean())
{
flags |= REGION_FLAGS_GAMING;
}
if (getChild<LLUICtrl>("hide from search")->getValue().asBoolean())
{
flags |= REGION_FLAGS_HIDE_FROM_SEARCH;
}
return flags;
}
@@ -708,6 +720,14 @@ U64 LLPanelRegionTools::getRegionFlagsMask() const
{
flags &= ~REGION_FLAGS_SANDBOX;
}
if (!getChild<LLUICtrl>("is gaming")->getValue().asBoolean())
{
flags &= ~REGION_FLAGS_GAMING;
}
if (!getChild<LLUICtrl>("hide from search")->getValue().asBoolean())
{
flags &= ~REGION_FLAGS_HIDE_FROM_SEARCH;
}
return flags;
}