summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-21 11:32:15 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-21 11:32:15 +0100
commitb95aef17ff696f94404ab507bd817f9a15d254cc (patch)
tree9f64128e7696c618899f81050ba6f0ae9c75e94f /indra/llmessage
parentdb73037c2882af70a09ac768ddb3748d811c767a (diff)
parent3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llassetstorage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 2494ab2792..8a781e9aea 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)