aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llrender.cpp')
-rw-r--r--linden/indra/llrender/llrender.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index fcd76d4..ff0a2db 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2001-2008, Linden Research, Inc. 7 * Copyright (c) 2001-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -186,17 +186,11 @@ bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
186 llwarns << "NULL LLTexUnit::bind texture" << llendl; 186 llwarns << "NULL LLTexUnit::bind texture" << llendl;
187 return false; 187 return false;
188 } 188 }
189 189
190 if (!texture->isInitialized() && !forceBind)
191 {
192 return texture->bindDefaultImage(mIndex);
193 }
194
195 if (!texture->getTexName()) //if texture does not exist 190 if (!texture->getTexName()) //if texture does not exist
196 { 191 {
197 return texture->bindDefaultImage(mIndex); 192 return texture->bindDefaultImage(mIndex);
198 } 193 }
199
200 // Disabled caching of binding state. 194 // Disabled caching of binding state.
201 activate(); 195 activate();
202 enable(texture->getTarget()); 196 enable(texture->getTarget());