diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llvlcomposition.cpp | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvlcomposition.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp index e0cb40d..af0fe96 100644 --- a/linden/indra/newview/llvlcomposition.cpp +++ b/linden/indra/newview/llvlcomposition.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -284,7 +285,7 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y, | |||
284 | ddiscard++; | 285 | ddiscard++; |
285 | min_dim /= 2; | 286 | min_dim /= 2; |
286 | } | 287 | } |
287 | if (!mDetailTextures[i]->readBackRaw(ddiscard, mRawImages[i])) | 288 | if (!mDetailTextures[i]->readBackRaw(ddiscard, mRawImages[i], false)) |
288 | { | 289 | { |
289 | llwarns << "Unable to read raw data for terrain detail texture: " << mDetailTextures[i]->getID() << llendl; | 290 | llwarns << "Unable to read raw data for terrain detail texture: " << mDetailTextures[i]->getID() << llendl; |
290 | mRawImages[i] = NULL; | 291 | mRawImages[i] = NULL; |