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.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index bcfe422d7a..e2c6305f4f 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -151,10 +151,10 @@ LLFloaterReporter::LLFloaterReporter(const LLSD& key)
mScreenID(),
mAbuserID(),
mOwnerName(),
- mDeselectOnClose( FALSE ),
- mPicking( FALSE),
+ mDeselectOnClose( false ),
+ mPicking( false),
mPosition(),
- mCopyrightWarningSeen( FALSE ),
+ mCopyrightWarningSeen( false ),
mResourceDatap(new LLResourceData()),
mAvatarNameCacheConnection()
{
@@ -162,13 +162,13 @@ LLFloaterReporter::LLFloaterReporter(const LLSD& key)
}
// virtual
-BOOL LLFloaterReporter::postBuild()
+bool LLFloaterReporter::postBuild()
{
LLSLURL slurl;
LLAgentUI::buildSLURL(slurl);
getChild<LLUICtrl>("abuse_location_edit")->setValue(slurl.getSLURLString());
- enableControls(TRUE);
+ enableControls(true);
// convert the position to a string
LLVector3d pos = gAgent.getPositionGlobal();
@@ -185,7 +185,7 @@ BOOL LLFloaterReporter::postBuild()
getChild<LLUICtrl>("owner_name")->setValue(LLStringUtil::null);
mOwnerName = LLStringUtil::null;
- getChild<LLUICtrl>("summary_edit")->setFocus(TRUE);
+ getChild<LLUICtrl>("summary_edit")->setFocus(true);
mDefaultSummary = getChild<LLUICtrl>("details_edit")->getValue().asString();
@@ -229,7 +229,7 @@ BOOL LLFloaterReporter::postBuild()
center();
- return TRUE;
+ return true;
}
// virtual
@@ -268,11 +268,11 @@ void LLFloaterReporter::onIdle(void* user_data)
}
}
-void LLFloaterReporter::enableControls(BOOL enable)
+void LLFloaterReporter::enableControls(bool enable)
{
getChildView("category_combo")->setEnabled(enable);
getChildView("chat_check")->setEnabled(enable);
- getChildView("screenshot")->setEnabled(FALSE);
+ getChildView("screenshot")->setEnabled(false);
getChildView("pick_btn")->setEnabled(enable);
getChildView("summary_edit")->setEnabled(enable);
getChildView("details_edit")->setEnabled(enable);
@@ -365,10 +365,10 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
void LLFloaterReporter::onClickSelectAbuser()
{
- LLView * button = findChild<LLButton>("select_abuser", TRUE);
+ LLView * button = findChild<LLButton>("select_abuser", true);
LLFloater * root_floater = gFloaterView->getParentFloater(this);
- LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLFloaterReporter::callbackAvatarID, this, _1, _2), FALSE, TRUE, FALSE, root_floater->getName(), button);
+ LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLFloaterReporter::callbackAvatarID, this, _1, _2), false, true, false, root_floater->getName(), button);
if (picker)
{
root_floater->addDependentFloater(picker);
@@ -504,7 +504,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
category_value == IP_PERMISSONS_EXPLOIT)
{
LLNotificationsUtil::add("HelpReportAbuseContainsCopyright");
- self->mCopyrightWarningSeen = TRUE;
+ self->mCopyrightWarningSeen = true;
return;
}
}
@@ -528,8 +528,8 @@ void LLFloaterReporter::onClickSend(void *userdata)
}
else
{
- self->getChildView("send_btn")->setEnabled(FALSE);
- self->getChildView("cancel_btn")->setEnabled(FALSE);
+ self->getChildView("send_btn")->setEnabled(false);
+ self->getChildView("cancel_btn")->setEnabled(false);
// the callback from uploading the image calls sendReportViaLegacy()
self->uploadImage();
}
@@ -543,7 +543,7 @@ void LLFloaterReporter::onClickCancel(void *userdata)
LLFloaterReporter *self = (LLFloaterReporter *)userdata;
// reset flag in case the next report also contains this text
- self->mCopyrightWarningSeen = FALSE;
+ self->mCopyrightWarningSeen = false;
if (self->mPicking)
{
@@ -559,12 +559,12 @@ void LLFloaterReporter::onClickObjPicker(void *userdata)
LLFloaterReporter *self = (LLFloaterReporter *)userdata;
LLToolObjPicker::getInstance()->setExitCallback(LLFloaterReporter::closePickTool, self);
LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
- self->mPicking = TRUE;
+ self->mPicking = true;
self->getChild<LLUICtrl>("object_name")->setValue(LLStringUtil::null);
self->getChild<LLUICtrl>("owner_name")->setValue(LLStringUtil::null);
self->mOwnerName = LLStringUtil::null;
LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
- if (pick_btn) pick_btn->setToggleState(TRUE);
+ if (pick_btn) pick_btn->setToggleState(true);
}
@@ -577,9 +577,9 @@ void LLFloaterReporter::closePickTool(void *userdata)
self->getObjectInfo(object_id);
LLToolMgr::getInstance()->clearTransientTool();
- self->mPicking = FALSE;
+ self->mPicking = false;
LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
- if (pick_btn) pick_btn->setToggleState(FALSE);
+ if (pick_btn) pick_btn->setToggleState(false);
}
@@ -594,7 +594,7 @@ void LLFloaterReporter::showFromMenu(EReportType report_type)
LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");
if(reporter_floater && reporter_floater->isInVisibleChain())
{
- gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE);
+ gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false);
}
reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter", LLSD());
if (reporter_floater)
@@ -609,7 +609,7 @@ void LLFloaterReporter::show(const LLUUID& object_id, const std::string& avatar_
LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");
if(reporter_floater && reporter_floater->isInVisibleChain())
{
- gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE);
+ gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false);
}
reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter");
if (avatar_name.empty())
@@ -627,7 +627,7 @@ void LLFloaterReporter::show(const LLUUID& object_id, const std::string& avatar_
}
// Need to deselect on close
- reporter_floater->mDeselectOnClose = TRUE;
+ reporter_floater->mDeselectOnClose = true;
}
@@ -637,13 +637,13 @@ void LLFloaterReporter::showFromExperience( const LLUUID& experience_id )
LLFloaterReporter* reporter_floater = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");
if(reporter_floater && reporter_floater->isInVisibleChain())
{
- gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", FALSE);
+ gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", false);
}
reporter_floater = LLFloaterReg::showTypedInstance<LLFloaterReporter>("reporter");
reporter_floater->getExperienceInfo(experience_id);
// Need to deselect on close
- reporter_floater->mDeselectOnClose = TRUE;
+ reporter_floater->mDeselectOnClose = true;
}
@@ -739,7 +739,7 @@ LLSD LLFloaterReporter::gatherReport()
if (!regionp) return LLSD(); // *TODO handle this failure case more gracefully
// reset flag in case the next report also contains this text
- mCopyrightWarningSeen = FALSE;
+ mCopyrightWarningSeen = false;
std::ostringstream summary;
if (!LLGridManager::getInstance()->isInProductionGrid())
@@ -873,7 +873,7 @@ void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url
void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot)
{
- gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", TRUE);
+ gSavedPerAccountSettings.setBOOL("PreviousScreenshotForReport", true);
if(!use_prev_screenshot)
{
std::string screenshot_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_PREV_FILENAME);
@@ -917,7 +917,7 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot)
// store in the image list so it doesn't try to fetch from the server
LLPointer<LLViewerFetchedTexture> image_in_list =
LLViewerTextureManager::getFetchedTexture(mResourceDatap->mAssetInfo.mUuid);
- image_in_list->createGLTexture(0, mImageRaw, 0, TRUE, LLGLTexture::OTHER);
+ image_in_list->createGLTexture(0, mImageRaw, 0, true, LLGLTexture::OTHER);
// the texture picker then uses that texture
LLTextureCtrl* texture = getChild<LLTextureCtrl>("screenshot");
@@ -937,14 +937,14 @@ void LLFloaterReporter::takeNewSnapshot()
const S32 IMAGE_HEIGHT = 768;
// Take a screenshot, but don't draw this floater.
- setVisible(FALSE);
- if (!gViewerWindow->rawSnapshot(mImageRaw,IMAGE_WIDTH, IMAGE_HEIGHT, TRUE, FALSE, TRUE /*UI*/, TRUE, FALSE))
+ setVisible(false);
+ if (!gViewerWindow->rawSnapshot(mImageRaw,IMAGE_WIDTH, IMAGE_HEIGHT, true, false, true /*UI*/, true, false))
{
LL_WARNS() << "Unable to take screenshot" << LL_ENDL;
- setVisible(TRUE);
+ setVisible(true);
return;
}
- setVisible(TRUE);
+ setVisible(true);
if(gSavedPerAccountSettings.getBOOL("PreviousScreenshotForReport"))
{
@@ -988,7 +988,7 @@ void LLFloaterReporter::uploadImage()
gAssetStorage->storeAssetData(mResourceDatap->mAssetInfo.mTransactionID,
mResourceDatap->mAssetInfo.mType,
LLFloaterReporter::uploadDoneCallback,
- (void*)mResourceDatap, TRUE);
+ (void*)mResourceDatap, true);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 02:31:50 +0000