diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:33:12 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:33:12 +0100 |
commit | 6985ed5c799dc10a1afe14fee6338a0243191753 (patch) | |
tree | 4711416a05284462f71436cf3e07a979660533cb /indra/llmessage | |
parent | 50b4783ad317b82791273c2d3b6e4260f7a5e77e (diff) | |
parent | 3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff) |
merge from viewer-trunk
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) |