aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llworld.cpp
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
-rw-r--r--linden/indra/newview/llworld.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 66c4068..28df561 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -32,6 +32,7 @@
32#include "llviewerprecompiledheaders.h" 32#include "llviewerprecompiledheaders.h"
33 33
34#include "llworld.h" 34#include "llworld.h"
35#include "llrender.h"
35 36
36#include "indra_constants.h" 37#include "indra_constants.h"
37#include "llstl.h" 38#include "llstl.h"
@@ -108,7 +109,7 @@ LLWorld::LLWorld() :
108 *(default_texture++) = MAX_WATER_COLOR.mV[3]; 109 *(default_texture++) = MAX_WATER_COLOR.mV[3];
109 110
110 mDefaultWaterTexturep = new LLViewerImage(raw, FALSE); 111 mDefaultWaterTexturep = new LLViewerImage(raw, FALSE);
111 mDefaultWaterTexturep->bind(); 112 gGL.getTexUnit(0)->bind(mDefaultWaterTexturep.get());
112 mDefaultWaterTexturep->setClamp(TRUE, TRUE); 113 mDefaultWaterTexturep->setClamp(TRUE, TRUE);
113 114
114} 115}