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

SH-2101 FIXED Remove checkbox for per-region mesh disablement 

- Remove checkbox for per-region mesh disablement and corresponding code
master
Paul ProductEngine 2011-07-21 20:31:00 +03:00
parent 74fd552256
commit aa40614cd4
3 changed files with 3 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/llfloaterregioninfo.cpp
View File

@ -172,30 +172,9 @@ bool estate_dispatch_initialized = false;
LLUUID LLFloaterRegionInfo::sRequestInvoice;
void LLFloaterRegionInfo::onConsoleReplyReceived(const std::string& output)
{
llwarns << "here is what they're giving us: " << output << llendl;
if (output.find("FALSE") != std::string::npos)
{
getChild<LLUICtrl>("mesh_rez_enabled_check")->setValue(FALSE);
}
else
{
getChild<LLUICtrl>("mesh_rez_enabled_check")->setValue(TRUE);
}
}
LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
: LLFloater(seed)
{
mConsoleReplySignalConnection = LLFloaterRegionDebugConsole::setConsoleReplyCallback(
boost::bind(
&LLFloaterRegionInfo::onConsoleReplyReceived,
this,
_1));
}
{}
BOOL LLFloaterRegionInfo::postBuild()
{
@ -246,9 +225,7 @@ BOOL LLFloaterRegionInfo::postBuild()
}
LLFloaterRegionInfo::~LLFloaterRegionInfo()
{
mConsoleReplySignalConnection.disconnect();
}
{}
void LLFloaterRegionInfo::onOpen(const LLSD& key)
{
@ -637,9 +614,6 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
getChildView("im_btn")->setEnabled(allow_modify);
getChildView("manage_telehub_btn")->setEnabled(allow_modify);
const bool enable_mesh = gMeshRepo.meshRezEnabled();
getChildView("mesh_rez_enabled_check")->setVisible(enable_mesh);
getChildView("mesh_rez_enabled_check")->setEnabled(getChildView("mesh_rez_enabled_check")->getEnabled() && enable_mesh);
// Data gets filled in by processRegionInfo
return LLPanelRegionInfo::refreshFromRegion(region);
@ -658,7 +632,6 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
initCtrl("access_combo");
initCtrl("restrict_pushobject");
initCtrl("block_parcel_search_check");
initCtrl("mesh_rez_enabled_check");
childSetAction("kick_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickKick, this));
childSetAction("kick_all_btn", onClickKickAll, this);
@ -874,27 +847,6 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
}
std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
if (!sim_console_url.empty())
{
std::string update_str = "set mesh_rez_enabled ";
if (getChild<LLUICtrl>("mesh_rez_enabled_check")->getValue().asBoolean())
{
update_str += "true";
}
else
{
update_str += "false";
}
LLHTTPClient::post(
sim_console_url,
LLSD(update_str),
new ConsoleUpdateResponder);
}
// if we changed access levels, tell user about it
LLViewerRegion* region = gAgent.getRegion();
if (region && (getChild<LLUICtrl>("access_combo")->getValue().asInteger() != region->getSimAccess()) )

4
indra/newview/llfloaterregioninfo.h
View File

@ -100,10 +100,6 @@ private:
LLFloaterRegionInfo(const LLSD& seed);
~LLFloaterRegionInfo();
void onConsoleReplyReceived(const std::string& output);
boost::signals2::connection mConsoleReplySignalConnection;;
protected:
void onTabSelected(const LLSD& param);

12
indra/newview/skins/default/xui/en/panel_region_general.xml
View File

@ -133,17 +133,7 @@
tool_tip="Let people see this region and its parcels in search results"
top="190"
width="80" />
<check_box
visible="FALSE"
height="20"
label="Allow Mesh Objects"
layout="topleft"
left="10"
name="mesh_rez_enabled_check"
tool_tip="Let people rez mesh objects on this region"
top="210"
width="80" />
<spinner
<spinner
decimal_digits="0"
follows="left|top"
height="20"