diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/llfloaterreporter.cpp | |
parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) |
merge with remote repo
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
-rw-r--r-- | indra/newview/llfloaterreporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index ad2fe34e95..0f4d6e33a3 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -770,7 +770,7 @@ void LLFloaterReporter::takeScreenshot() if (COMPLAINT_REPORT == mReportType) { mResourceDatap->mAssetInfo.mType = LLAssetType::AT_TEXTURE; - mResourceDatap->mPreferredLocation = LLAssetType::EType(-2); + mResourceDatap->mPreferredLocation = LLFolderType::EType(LLResourceData::INVALID_LOCATION); } else { @@ -838,7 +838,7 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data, } EReportType report_type = UNKNOWN_REPORT; - if (data->mPreferredLocation == -2) + if (data->mPreferredLocation == LLResourceData::INVALID_LOCATION) { report_type = COMPLAINT_REPORT; } |