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 | c2886da65dfc45ec28bf5e8ecd02525ac696629e (patch) | |
| tree | 37edc9dde054fbc370dcb62408027092ef18c877 /indra/llmessage | |
| parent | 1e904da79c3eaa28cf53b63f306cc7482df77a95 (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) | 
