diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 11:43:43 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 11:43:43 -0700 |
| commit | 270d13388223b641b3746000209c2c55c5fb641d (patch) | |
| tree | 79bddeb0ad19640299a0ae5e08fba3230adbbde8 /indra/llmessage | |
| parent | 9fdba53b09193290ab33fc6aa414329d126505ed (diff) | |
| parent | c34bb6f62b0ce623074378173fa9693d938eeb89 (diff) | |
Automated merge
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llassetstorage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index 20d71c6903..bf0ed97143 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -408,8 +408,8 @@ bool LLAssetStorage::findInStaticVFSAndInvokeCallback(const LLUUID& uuid, LLAsse if (exists) { LLVFile file(mStaticVFS, uuid, type); - U32 size = exists ? file.getSize() : 0; - if (size>0) + U32 size = file.getSize(); + if (size > 0) { // we've already got the file if (callback) |