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

1
indra/llinventory/llparcelflags.h
View File

@@ -59,6 +59,7 @@ const U32 PF_URL_WEB_PAGE = 1 << 19; // The "media URL" is an HTML page
const U32 PF_URL_RAW_HTML = 1 << 20; // The "media URL" is a raw HTML string like <H1>Foo</H1>
const U32 PF_RESTRICT_PUSHOBJECT = 1 << 21; // Restrict push object to either on agent or on scripts owned by parcel owner
const U32 PF_DENY_ANONYMOUS = 1 << 22; // Deny all non identified/transacted accounts
const U32 PF_GAMING = 1 << 23; // Denotes a gaming parcel on certain grids
// const U32 PF_DENY_IDENTIFIED = 1 << 23; // Deny identified accounts
// const U32 PF_DENY_TRANSACTED = 1 << 24; // Deny identified accounts
const U32 PF_ALLOW_GROUP_SCRIPTS = 1 << 25; // Allow scripts owned by group

2
indra/llmessage/llqueryflags.h
View File

@@ -66,6 +66,8 @@ const U32 DFQ_INC_NEW_VIEWER = (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT); //
const U32 DFQ_ADULT_SIMS_ONLY = 0x1 << 27;
const U32 DFQ_FILTER_GAMING = 0x1 << 28;
// Sell Type flags
const U32 ST_AUCTION = 0x1 << 1;
const U32 ST_NEWBIE = 0x1 << 2;

2
indra/llmessage/llregionflags.h
View File

@@ -51,6 +51,8 @@ const U64 REGION_FLAGS_BLOCK_LAND_RESELL = (1 << 7);
// All content wiped once per night
const U64 REGION_FLAGS_SANDBOX = (1 << 8);
const U64 REGION_FLAGS_GAMING = (1 << 10); // Denotes a gaming region on certain grids
const U64 REGION_FLAGS_HIDE_FROM_SEARCH = (1 << 11); // Hides region from search on certain grids
const U64 REGION_FLAGS_SKIP_COLLISIONS = (1 << 12); // Pin all non agent rigid bodies
const U64 REGION_FLAGS_SKIP_SCRIPTS = (1 << 13);
const U64 REGION_FLAGS_SKIP_PHYSICS = (1 << 14); // Skip all physics

78
indra/newview/app_settings/settings.xml
View File

@@ -5768,6 +5768,84 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<real>10.0</real>
</map>
<key>FilterGamingSearchAll</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in everything search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterGamingClassifieds</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in classifieds search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterGamingEvents</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in event search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterGamingGroups</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in groups search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterGamingLand</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in land search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterGamingSims</key>
<map>
<key>Comment</key>
<string>Filter results flagged gaming in sim search</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FilterItemsPerFrame</key>
<map>
<key>Comment</key>

4
indra/newview/hippogridmanager.cpp
View File

@@ -357,7 +357,7 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
}
else if (ty == SEARCH_ALL_TEMPLATE)
{
return "lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]";
return "lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]&dice=[DICE]";
}
else
{
@@ -400,7 +400,7 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
}
else if (ty == SEARCH_ALL_TEMPLATE)
{
return "lang=[LANG]&m=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]";
return "lang=[LANG]&m=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]&dice=[DICE]";
}
else
{

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;
}

8
indra/newview/llfloaterland.cpp
View File

@@ -1859,6 +1859,7 @@ LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
mSetBtn(NULL),
mClearBtn(NULL),
mMatureCtrl(NULL),
mGamingCtrl(NULL),
mPushRestrictionCtrl(NULL),
mSeeAvatarsCtrl(NULL),
mParcel(parcel),
@@ -1936,6 +1937,10 @@ BOOL LLPanelLandOptions::postBuild()
mMatureCtrl = getChild<LLCheckBoxCtrl>( "MatureCheck");
childSetCommitCallback("MatureCheck", onCommitAny, this);
mGamingCtrl = getChild<LLCheckBoxCtrl>( "GamingCheck");
childSetCommitCallback("GamingCheck", onCommitAny, this);
mGamingCtrl->setVisible(!gAgent.getRegion()->getCapability("GamingData").empty());
mPublishHelpButton = getChild<LLButton>("?");
mPublishHelpButton->setClickedCallback(onClickPublishHelp, this);
@@ -2165,6 +2170,7 @@ void LLPanelLandOptions::refresh()
mMatureCtrl->setToolTip(getString("mature_check_adult_tooltip"));
}
}
mGamingCtrl->set(parcel->getParcelFlag(PF_GAMING));
}
}
}
@@ -2302,6 +2308,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
BOOL mature_publish = self->mMatureCtrl->get();
BOOL push_restriction = self->mPushRestrictionCtrl->get();
BOOL see_avs = self->mSeeAvatarsCtrl->get();
bool gaming = self->mGamingCtrl->get();
BOOL show_directory = self->mCheckShowDirectory->get();
// we have to get the index from a lookup, not from the position in the dropdown!
S32 category_index = LLParcel::getCategoryFromString(self->mCategoryCombo->getSelectedValue());
@@ -2336,6 +2343,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
parcel->setParcelFlag(PF_SHOW_DIRECTORY, show_directory);
parcel->setParcelFlag(PF_ALLOW_PUBLISH, allow_publish);
parcel->setParcelFlag(PF_MATURE_PUBLISH, mature_publish);
parcel->setParcelFlag(PF_GAMING, gaming);
parcel->setParcelFlag(PF_RESTRICT_PUSHOBJECT, push_restriction);
parcel->setCategory((LLParcel::ECategory)category_index);
parcel->setLandingType((LLParcel::ELandingType)landing_type_index);

1
indra/newview/llfloaterland.h
View File

@@ -362,6 +362,7 @@ private:
LLButton* mClearBtn;
LLCheckBoxCtrl *mMatureCtrl;
LLCheckBoxCtrl *mGamingCtrl;
LLCheckBoxCtrl *mPushRestrictionCtrl;
LLCheckBoxCtrl *mSeeAvatarsCtrl;
LLButton *mPublishHelpButton;

3
indra/newview/llpaneldirclassified.cpp
View File

@@ -121,6 +121,8 @@ BOOL LLPanelDirClassified::postBuild()
// Don't do this every time we open find, it's expensive; require clicking 'search'
//requestClassified();
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -206,6 +208,7 @@ void LLPanelDirClassified::performQuery()
BOOL filter_auto_renew = FALSE;
U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg, inc_mature, inc_adult);
//if (gAgent.isTeen()) query_flags |= DFQ_PG_SIMS_ONLY;
if (childGetValue("filter_gaming")) query_flags |= DFQ_FILTER_GAMING;
U32 category = childGetValue("Category").asInteger();

4
indra/newview/llpaneldirevents.cpp
View File

@@ -51,6 +51,7 @@
#include "llpanelevent.h"
#include "llappviewer.h"
#include "llnotificationsutil.h"
#include "llviewerregion.h"
BOOL gDisplayEventHack = FALSE;
@@ -94,6 +95,8 @@ BOOL LLPanelDirEvents::postBuild()
}
gDisplayEventHack = FALSE;
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -181,6 +184,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
if ( childGetValue("incpg").asBoolean() ) scope |= DFQ_INC_PG;
if ( childGetValue("incmature").asBoolean() ) scope |= DFQ_INC_MATURE;
if ( childGetValue("incadult").asBoolean() ) scope |= DFQ_INC_ADULT;
if (childGetValue("filter_gaming").asBoolean()) scope |= DFQ_FILTER_GAMING;
// Add old query flags in case we are talking to an old server
if ( childGetValue("incpg").asBoolean() && !childGetValue("incmature").asBoolean())

26
indra/newview/llpaneldirfind.cpp
View File

@@ -161,6 +161,8 @@ BOOL LLPanelDirFind::postBuild()
navigateToDefaultPage();
}
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -309,9 +311,9 @@ void LLPanelDirFind::navigateToDefaultPage()
mWebBrowser->navigateTo( start_url );
}
}
// static
std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection,
bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
const std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection,
bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const
{
std::string url;
if (search_text.empty())
@@ -363,8 +365,8 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
llinfos << "web search url " << url << llendl;
return url;
}
// static
std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
const std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const
{
std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE, is_web);
llinfos << "Suffix template " << url << llendl;
@@ -426,6 +428,13 @@ std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, boo
std::string teen_string = gAgent.isTeen() ? "y" : "n";
std::string teen_tag = "[TEEN]";
url.replace( url.find( teen_tag ), teen_tag.length(), teen_string );
// and set the flag for gaming areas if not on SL Grid.
if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
{
substring = "[DICE]";
url.replace(url.find(substring), substring.length(), childGetValue("filter_gaming").asBoolean() ? "y" : "n");
}
}
}
@@ -561,6 +570,8 @@ BOOL LLPanelDirFindAllOld::postBuild()
childDisable("Search");
setDefaultBtn( "Search" );
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -623,6 +634,11 @@ void LLPanelDirFindAllOld::onClickSearch(void *userdata)
scope |= DFQ_INC_ADULT;
}
if (self->childGetValue("filter_gaming").asBoolean())
{
scope |= DFQ_FILTER_GAMING;
}
// send the message
LLMessageSystem *msg = gMessageSystem;
S32 start_row = 0;

4
indra/newview/llpaneldirfind.h
View File

@@ -61,8 +61,8 @@ public:
virtual void navigateToDefaultPage();
void focus();
static std::string buildSearchURL(const std::string& search_text, const std::string& collection, bool inc_pg, bool inc_mature, bool inc_adult, bool is_web);
static std::string getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web);
const std::string buildSearchURL(const std::string& search_text, const std::string& collection, bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const;
const std::string getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const;
private:
static void onClickBack( void* data );

7
indra/newview/llpaneldirgroups.cpp
View File

@@ -40,6 +40,7 @@
#include "message.h"
#include "llqueryflags.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
#include "llnotificationsutil.h"
@@ -60,6 +61,8 @@ BOOL LLPanelDirGroups::postBuild()
childDisable("Search");
setDefaultBtn( "Search" );
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -130,6 +133,10 @@ void LLPanelDirGroups::performQuery()
{
scope |= DFQ_INC_ADULT;
}
if (childGetValue("filter_gaming").asBoolean())
{
scope |= DFQ_FILTER_GAMING;
}
mCurrentSortColumn = "score";
mCurrentSortAscending = FALSE;

8
indra/newview/llpaneldirland.cpp
View File

@@ -52,6 +52,7 @@
#include "lltextbox.h"
#include "llviewercontrol.h"
#include "llviewermessage.h"
#include "llviewerregion.h"
#include "hippogridmanager.h"
@@ -125,6 +126,8 @@ BOOL LLPanelDirLand::postBuild()
}
}
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
return TRUE;
}
@@ -213,6 +216,11 @@ void LLPanelDirLand::performQuery()
{
query_flags |= DFQ_INC_ADULT;
}
if (childGetValue("filter_gaming").asBoolean())
{
query_flags |= DFQ_FILTER_GAMING;
}
// Add old flags in case we are talking to an old dataserver
if (inc_pg && !inc_mature)

8
indra/newview/llpaneldirplaces.cpp
View File

@@ -57,6 +57,7 @@
#include "lluiconstants.h"
#include "llviewercontrol.h"
#include "llviewermessage.h"
#include "llviewerregion.h"
#include "llworldmap.h"
LLPanelDirPlaces::LLPanelDirPlaces(const std::string& name, LLFloaterDirectory* floater)
@@ -98,6 +99,8 @@ BOOL LLPanelDirPlaces::postBuild()
childSetEnabled("Category", true);
}
childSetVisible("filter_gaming", !gAgent.getRegion()->getCapability("GamingData").empty());
// Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC
// initialQuery();
@@ -198,6 +201,11 @@ void LLPanelDirPlaces::performQuery()
{
flags |= DFQ_INC_ADULT;
}
if (childGetValue("filter_gaming").asBoolean())
{
flags |= DFQ_FILTER_GAMING;
}
// Pack old query flag in case we are talking to an old server
if ( ((flags & DFQ_INC_PG) == DFQ_INC_PG) && !((flags & DFQ_INC_MATURE) == DFQ_INC_MATURE) )

1
indra/newview/llviewerregion.cpp
View File

@@ -1613,6 +1613,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("FetchInventoryDescendents2");
}
capabilityNames.append("GamingData"); //Used by certain grids.
capabilityNames.append("GetDisplayNames");
capabilityNames.append("GetMesh");
capabilityNames.append("GetObjectCost");

1
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -745,6 +745,7 @@ Only large parcels can be listed in search.
mouse_opaque="true" name="MatureCheck" radio_style="false"
tool_tip=" "
width="107" />
<check_box name="GamingCheck" label="This parcel is used for gaming" bottom_delta="0" left="178" follows="left|top" height="16"/>
<string name="mature_check_mature">
Mature Content
</string>

5
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -68,6 +68,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="450" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-58" left="550"/>
<button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
halign="center" height="18" label="?" label_selected="?" left="-25"
mouse_opaque="true" name="?" width="18" />
@@ -116,6 +117,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-22" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="158">
<combo_item name="AnyCategory" value="0">
@@ -281,6 +283,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
visible="true" width="95" />
@@ -379,6 +382,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" tab_group="9" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
<combo_item name="AllTypes" value="All Types">
@@ -473,6 +477,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
<combo_item name="AnyCategory" value="any">

6
indra/newview/skins/default/xui/en-us/floater_directory2.xml
View File

@@ -43,6 +43,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="120" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-22" left_delta="120"/>
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="false" fg_disable_color="1, 1, 1, 1"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
@@ -93,6 +94,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-58" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="158">
<combo_item name="AnyCategory" value="0">
@@ -258,6 +260,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
visible="true" width="95" />
@@ -316,6 +319,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" tab_group="9" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="420"/>
<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
<combo_item name="AllTypes" value="All Types">
@@ -410,6 +414,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="420"/>
<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
<combo_item name="AnyCategory" value="any">
@@ -604,6 +609,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="110" mouse_opaque="true"
name="incadult" width="204" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingGroups" follows="right|top" bottom="-46" left_delta="110"/>
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="true"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"

7
indra/newview/skins/default/xui/en-us/floater_directory3.xml
View File

@@ -43,6 +43,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="120" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-22" left_delta="120"/>
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="false" fg_disable_color="1, 1, 1, 1"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
@@ -126,6 +127,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="450" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-58" left="550"/>
<button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
halign="center" height="18" label="?" label_selected="?" left="-25"
mouse_opaque="true" name="?" width="18" />
@@ -174,6 +176,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-22" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="158">
<combo_item name="AnyCategory" value="0">
@@ -339,6 +342,7 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
visible="true" width="95" />
@@ -437,6 +441,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" tab_group="9" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
<combo_item name="AllTypes" value="All Types">
@@ -531,6 +536,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="520"/>
<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
<combo_item name="AnyCategory" value="any">
@@ -725,6 +731,7 @@ To buy direct, visit the land and click on the place name in the title bar.
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="110" mouse_opaque="true"
name="incadult" width="204" />
<check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingGroups" follows="right|top" bottom="-46" left_delta="110"/>
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="true"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"

4
indra/newview/skins/default/xui/en-us/floater_god_tools.xml
View File

@@ -60,7 +60,9 @@
initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
width="180" />
<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
<check_box name="is gaming" label="Gaming" tool_tip="Toggle whether this is a gaming region." bottom_delta="-20" follows="left|top"/>
<check_box name="hide from search" label="Hide region from search" tool_tip="Toggle whether this region is searchable at all." bottom_delta="-20" follows="left|top"/>
<button bottom_delta="-32" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
mouse_opaque="true" name="Bake Terrain"
tool_tip="Save the current terrain as default." width="110" />