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/test/lldatapacker_tut.cpp | |
| parent | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
Diffstat (limited to 'indra/test/lldatapacker_tut.cpp')
| -rwxr-xr-x | indra/test/lldatapacker_tut.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp index cf2b7870ef..b403660c13 100755 --- a/indra/test/lldatapacker_tut.cpp +++ b/indra/test/lldatapacker_tut.cpp @@ -349,7 +349,7 @@ namespace tut LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, "w+"); if(!fp) { - llerrs << "File couldnt be open" <<llendl; + LL_ERRS() << "File couldnt be open" << LL_ENDL; return; } @@ -404,7 +404,7 @@ namespace tut LLFILE* fp = LLFile::fopen(TEST_FILE_NAME,"w+"); if(!fp) { - llerrs << "File couldnt be open" <<llendl; + LL_ERRS() << "File couldnt be open" << LL_ENDL; return; } |