diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
| commit | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (patch) | |
| tree | cf677aea0a81ecddbb394e64c9bd07db517880af /indra/llcommon/llapr.cpp | |
| parent | c3fa45282f5bdb0cb7a3fcd680154e88cafde4bb (diff) | |
| parent | 3a7490e492b35d5dc55f6124d2e1acbca3bd4d79 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llcommon/llapr.cpp')
| -rw-r--r-- | indra/llcommon/llapr.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index ed70b1d9f2..7330b00bcf 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -543,14 +543,13 @@ S32 LLAPRFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nb return 0; } - S32 off; - if (offset < 0) - off = LLAPRFile::seek(file_handle, APR_END, 0); - else - off = LLAPRFile::seek(file_handle, APR_SET, offset); + llassert(offset >= 0); + + if (offset > 0) + offset = LLAPRFile::seek(file_handle, APR_SET, offset); apr_size_t bytes_read; - if (off < 0) + if (offset < 0) { bytes_read = 0; } |