diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
| commit | 8dae4bc222d1b0744254442ab0b26538285341de (patch) | |
| tree | 88da67f01f0dc32457b4a5085d5e699ea55715a4 /indra/newview/lluploadfloaterobservers.cpp | |
| parent | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
Diffstat (limited to 'indra/newview/lluploadfloaterobservers.cpp')
| -rwxr-xr-x | indra/newview/lluploadfloaterobservers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lluploadfloaterobservers.cpp b/indra/newview/lluploadfloaterobservers.cpp index 1d777b3f7f..248f1bf1d5 100755 --- a/indra/newview/lluploadfloaterobservers.cpp +++ b/indra/newview/lluploadfloaterobservers.cpp @@ -35,8 +35,8 @@ LLUploadModelPremissionsResponder::LLUploadModelPremissionsResponder(const LLHan void LLUploadModelPremissionsResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content) { - llwarns << "LLUploadModelPremissionsResponder error [status:" - << status << "]: " << content << llendl; + LL_WARNS() << "LLUploadModelPremissionsResponder error [status:" + << status << "]: " << content << LL_ENDL; LLUploadPermissionsObserver* observer = mObserverHandle.get(); |