summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterreporter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
-rw-r--r--indra/newview/llfloaterreporter.cpp104
1 files changed, 52 insertions, 52 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 230d4be85b..f7c8855bf6 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -128,7 +128,7 @@ BOOL LLFloaterReporter::postBuild()
{
LLSLURL slurl;
LLAgentUI::buildSLURL(slurl);
- getChild<LLUICtrl>("abuse_location_edit")->setValue(slurl.getSLURLString());
+ childSetText("abuse_location_edit", slurl.getSLURLString());
enableControls(TRUE);
@@ -137,7 +137,7 @@ BOOL LLFloaterReporter::postBuild()
LLViewerRegion *regionp = gAgent.getRegion();
if (regionp)
{
- getChild<LLUICtrl>("sim_field")->setValue(regionp->getName());
+ childSetText("sim_field", regionp->getName());
pos -= regionp->getOriginGlobal();
}
setPosBox(pos);
@@ -148,13 +148,13 @@ BOOL LLFloaterReporter::postBuild()
setVisible(TRUE);
// Default text to be blank
- getChild<LLUICtrl>("object_name")->setValue(LLStringUtil::null);
- getChild<LLUICtrl>("owner_name")->setValue(LLStringUtil::null);
+ childSetText("object_name", LLStringUtil::null);
+ childSetText("owner_name", LLStringUtil::null);
mOwnerName = LLStringUtil::null;
- getChild<LLUICtrl>("summary_edit")->setFocus(TRUE);
+ childSetFocus("summary_edit");
- mDefaultSummary = getChild<LLUICtrl>("details_edit")->getValue().asString();
+ mDefaultSummary = childGetText("details_edit");
// send a message and ask for information about this region -
// result comes back in processRegionInfo(..)
@@ -184,7 +184,7 @@ BOOL LLFloaterReporter::postBuild()
// grab the user's name
std::string fullname;
LLAgentUI::buildFullname(fullname);
- getChild<LLUICtrl>("reporter_field")->setValue(fullname);
+ childSetText("reporter_field", fullname);
center();
@@ -212,22 +212,22 @@ LLFloaterReporter::~LLFloaterReporter()
// virtual
void LLFloaterReporter::draw()
{
- getChildView("screen_check")->setEnabled(TRUE );
+ childSetEnabled("screen_check", TRUE );
LLFloater::draw();
}
void LLFloaterReporter::enableControls(BOOL enable)
{
- getChildView("category_combo")->setEnabled(enable);
- getChildView("chat_check")->setEnabled(enable);
- getChildView("screen_check")->setEnabled(enable);
- getChildView("screenshot")->setEnabled(FALSE);
- getChildView("pick_btn")->setEnabled(enable);
- getChildView("summary_edit")->setEnabled(enable);
- getChildView("details_edit")->setEnabled(enable);
- getChildView("send_btn")->setEnabled(enable);
- getChildView("cancel_btn")->setEnabled(enable);
+ childSetEnabled("category_combo", enable);
+ childSetEnabled("chat_check", enable);
+ childSetEnabled("screen_check", enable);
+ childDisable("screenshot");
+ childSetEnabled("pick_btn", enable);
+ childSetEnabled("summary_edit", enable);
+ childSetEnabled("details_edit", enable);
+ childSetEnabled("send_btn", enable);
+ childSetEnabled("cancel_btn", enable);
}
void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
@@ -259,7 +259,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
LLViewerRegion *regionp = objectp->getRegion();
if (regionp)
{
- getChild<LLUICtrl>("sim_field")->setValue(regionp->getName());
+ childSetText("sim_field", regionp->getName());
LLVector3d global_pos;
global_pos.setVec(objectp->getPositionRegion());
setPosBox(global_pos);
@@ -313,7 +313,7 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
{
if (ids.empty() || names.empty()) return;
- getChild<LLUICtrl>("abuser_name_edit")->setValue(names[0] );
+ childSetText("abuser_name_edit", names[0] );
mAbuserID = ids[0];
@@ -328,9 +328,9 @@ void LLFloaterReporter::setFromAvatar(const LLUUID& avatar_id, const std::string
std::string avatar_link =
LLSLURL("agent", mObjectID, "inspect").getSLURLString();
- getChild<LLUICtrl>("owner_name")->setValue(avatar_link);
- getChild<LLUICtrl>("object_name")->setValue(avatar_name);
- getChild<LLUICtrl>("abuser_name_edit")->setValue(avatar_name);
+ childSetText("owner_name", avatar_link);
+ childSetText("object_name", avatar_name);
+ childSetText("abuser_name_edit", avatar_name);
}
// static
@@ -354,9 +354,9 @@ void LLFloaterReporter::onClickSend(void *userdata)
if ( ! self->mCopyrightWarningSeen )
{
- std::string details_lc = self->getChild<LLUICtrl>("details_edit")->getValue().asString();
+ std::string details_lc = self->childGetText("details_edit");
LLStringUtil::toLower( details_lc );
- std::string summary_lc = self->getChild<LLUICtrl>("summary_edit")->getValue().asString();
+ std::string summary_lc = self->childGetText("summary_edit");
LLStringUtil::toLower( summary_lc );
if ( details_lc.find( "copyright" ) != std::string::npos ||
summary_lc.find( "copyright" ) != std::string::npos ||
@@ -387,10 +387,10 @@ void LLFloaterReporter::onClickSend(void *userdata)
}
else
{
- if(self->getChild<LLUICtrl>("screen_check")->getValue())
+ if(self->childGetValue("screen_check"))
{
- self->getChildView("send_btn")->setEnabled(FALSE);
- self->getChildView("cancel_btn")->setEnabled(FALSE);
+ self->childDisable("send_btn");
+ self->childDisable("cancel_btn");
// the callback from uploading the image calls sendReportViaLegacy()
self->uploadImage();
}
@@ -428,8 +428,8 @@ void LLFloaterReporter::onClickObjPicker(void *userdata)
LLToolObjPicker::getInstance()->setExitCallback(LLFloaterReporter::closePickTool, self);
LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
self->mPicking = TRUE;
- self->getChild<LLUICtrl>("object_name")->setValue(LLStringUtil::null);
- self->getChild<LLUICtrl>("owner_name")->setValue(LLStringUtil::null);
+ self->childSetText("object_name", LLStringUtil::null);
+ self->childSetText("owner_name", LLStringUtil::null);
self->mOwnerName = LLStringUtil::null;
LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
if (pick_btn) pick_btn->setToggleState(TRUE);
@@ -475,7 +475,7 @@ void LLFloaterReporter::show(const LLUUID& object_id, const std::string& avatar_
// grab the user's name
std::string fullname;
LLAgentUI::buildFullname(fullname);
- f->getChild<LLUICtrl>("reporter_field")->setValue(fullname);
+ f->childSetText("reporter_field", fullname);
if (avatar_name.empty())
// Request info for this object
@@ -504,11 +504,11 @@ void LLFloaterReporter::showFromAvatar(const LLUUID& avatar_id, const std::strin
void LLFloaterReporter::setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id)
{
- getChild<LLUICtrl>("object_name")->setValue(object_name);
+ childSetText("object_name", object_name);
std::string owner_link =
LLSLURL("agent", owner_id, "inspect").getSLURLString();
- getChild<LLUICtrl>("owner_name")->setValue(owner_link);
- getChild<LLUICtrl>("abuser_name_edit")->setValue(owner_name);
+ childSetText("owner_name", owner_link);
+ childSetText("abuser_name_edit", owner_name);
mAbuserID = owner_id;
mOwnerName = owner_name;
}
@@ -517,7 +517,7 @@ void LLFloaterReporter::setPickedObjectProperties(const std::string& object_name
bool LLFloaterReporter::validateReport()
{
// Ensure user selected a category from the list
- LLSD category_sd = getChild<LLUICtrl>("category_combo")->getValue();
+ LLSD category_sd = childGetValue("category_combo");
U8 category = (U8)category_sd.asInteger();
if (category == 0)
{
@@ -526,32 +526,32 @@ bool LLFloaterReporter::validateReport()
}
- if ( getChild<LLUICtrl>("abuser_name_edit")->getValue().asString().empty() )
+ if ( childGetText("abuser_name_edit").empty() )
{
LLNotificationsUtil::add("HelpReportAbuseAbuserNameEmpty");
return false;
};
- if ( getChild<LLUICtrl>("abuse_location_edit")->getValue().asString().empty() )
+ if ( childGetText("abuse_location_edit").empty() )
{
LLNotificationsUtil::add("HelpReportAbuseAbuserLocationEmpty");
return false;
};
- if ( getChild<LLUICtrl>("abuse_location_edit")->getValue().asString().empty() )
+ if ( childGetText("abuse_location_edit").empty() )
{
LLNotificationsUtil::add("HelpReportAbuseAbuserLocationEmpty");
return false;
};
- if ( getChild<LLUICtrl>("summary_edit")->getValue().asString().empty() )
+ if ( childGetText("summary_edit").empty() )
{
LLNotificationsUtil::add("HelpReportAbuseSummaryEmpty");
return false;
};
- if ( getChild<LLUICtrl>("details_edit")->getValue().asString() == mDefaultSummary )
+ if ( childGetText("details_edit") == mDefaultSummary )
{
LLNotificationsUtil::add("HelpReportAbuseDetailsEmpty");
return false;
@@ -597,17 +597,17 @@ LLSD LLFloaterReporter::gatherReport()
summary << ""
<< " |" << regionp->getName() << "|" // region reporter is currently in.
- << " (" << getChild<LLUICtrl>("abuse_location_edit")->getValue().asString() << ")" // region abuse occured in (freeform text - no LLRegionPicker tool)
+ << " (" << childGetText("abuse_location_edit") << ")" // region abuse occured in (freeform text - no LLRegionPicker tool)
<< " [" << category_name << "] " // updated category
- << " {" << getChild<LLUICtrl>("abuser_name_edit")->getValue().asString() << "} " // name of abuse entered in report (chosen using LLAvatarPicker)
- << " \"" << getChild<LLUICtrl>("summary_edit")->getValue().asString() << "\""; // summary as entered
+ << " {" << childGetText("abuser_name_edit") << "} " // name of abuse entered in report (chosen using LLAvatarPicker)
+ << " \"" << childGetValue("summary_edit").asString() << "\""; // summary as entered
std::ostringstream details;
details << "V" << LLVersionInfo::getVersion() << std::endl << std::endl; // client version moved to body of email for abuse reports
- std::string object_name = getChild<LLUICtrl>("object_name")->getValue().asString();
+ std::string object_name = childGetText("object_name");
if (!object_name.empty() && !mOwnerName.empty())
{
details << "Object: " << object_name << "\n";
@@ -615,10 +615,10 @@ LLSD LLFloaterReporter::gatherReport()
}
- details << "Abuser name: " << getChild<LLUICtrl>("abuser_name_edit")->getValue().asString() << " \n";
- details << "Abuser location: " << getChild<LLUICtrl>("abuse_location_edit")->getValue().asString() << " \n";
+ details << "Abuser name: " << childGetText("abuser_name_edit") << " \n";
+ details << "Abuser location: " << childGetText("abuse_location_edit") << " \n";
- details << getChild<LLUICtrl>("details_edit")->getValue().asString();
+ details << childGetValue("details_edit").asString();
std::string version_string;
version_string = llformat(
@@ -632,14 +632,14 @@ LLSD LLFloaterReporter::gatherReport()
// only send a screenshot ID if we're asked to and the email is
// going to LL - Estate Owners cannot see the screenshot asset
LLUUID screenshot_id = LLUUID::null;
- if (getChild<LLUICtrl>("screen_check")->getValue())
+ if (childGetValue("screen_check"))
{
- screenshot_id = getChild<LLUICtrl>("screenshot")->getValue();
+ screenshot_id = childGetValue("screenshot");
};
LLSD report = LLSD::emptyMap();
report["report-type"] = (U8) mReportType;
- report["category"] = getChild<LLUICtrl>("category_combo")->getValue();
+ report["category"] = childGetValue("category_combo");
report["position"] = mPosition.getValue();
report["check-flags"] = (U8)0; // this is not used
report["screenshot-id"] = screenshot_id;
@@ -721,7 +721,7 @@ public:
void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report)
{
- if(getChild<LLUICtrl>("screen_check")->getValue().asBoolean() && !sshot_url.empty())
+ if(childGetValue("screen_check").asBoolean() && !sshot_url.empty())
{
// try to upload screenshot
LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report,
@@ -853,7 +853,7 @@ void LLFloaterReporter::setPosBox(const LLVector3d &pos)
mPosition.mV[VX],
mPosition.mV[VY],
mPosition.mV[VZ]);
- getChild<LLUICtrl>("pos_field")->setValue(pos_string);
+ childSetText("pos_field", pos_string);
}
// void LLFloaterReporter::setDescription(const std::string& description, LLMeanCollisionData *mcd)
@@ -861,7 +861,7 @@ void LLFloaterReporter::setPosBox(const LLVector3d &pos)
// LLFloaterReporter *self = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");
// if (self)
// {
-// self->getChild<LLUICtrl>("details_edit")->setValue(description);
+// self->childSetText("details_edit", description);
// for_each(self->mMCDList.begin(), self->mMCDList.end(), DeletePointer());
// self->mMCDList.clear();