diff options
author | Eli Linden <eli@lindenlab.com> | 2010-04-20 11:42:45 -0700 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-04-20 11:42:45 -0700 |
commit | 12893bc7b1194afaa4b9059665e34624abfcce1d (patch) | |
tree | 67fe2a50777e4228e0177786eecf5f86d77cbc6e /indra/llmessage | |
parent | 5f80e5681c7a0e9f0fc5889ede435c79358fc639 (diff) | |
parent | 47699b744cf99ae9f39530dc9a08455b0d92e0f0 (diff) |
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) |