diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 |
commit | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (patch) | |
tree | 54de76637c610b85957197c9218d77e3c8212f00 /indra/newview/llfloaterreporter.cpp | |
parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) |
For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
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 70a3ad5252..b146ed9b38 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; } |