diff options
author | Jacek Antonelli | 2010-02-09 21:11:42 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-16 18:50:15 -0600 |
commit | e6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch) | |
tree | 10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/llrender/llrender.h | |
parent | Ported some cURL and HTTP-related changes from Snowglobe. (diff) | |
download | meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2 meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz |
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/llrender/llrender.h')
-rw-r--r-- | linden/indra/llrender/llrender.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h index 437c715..ce84e74 100644 --- a/linden/indra/llrender/llrender.h +++ b/linden/indra/llrender/llrender.h | |||
@@ -148,7 +148,7 @@ public: | |||
148 | 148 | ||
149 | // Binds the LLImageGL to this texture unit | 149 | // Binds the LLImageGL to this texture unit |
150 | // (automatically enables the unit for the LLImageGL's texture type) | 150 | // (automatically enables the unit for the LLImageGL's texture type) |
151 | bool bind(LLImageGL* texture, bool forceBind = false); | 151 | bool bind(LLImageGL* texture, bool for_rendering = false, bool forceBind = false); |
152 | 152 | ||
153 | // Binds a cubemap to this texture unit | 153 | // Binds a cubemap to this texture unit |
154 | // (automatically enables the texture unit for cubemaps) | 154 | // (automatically enables the texture unit for cubemaps) |