aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
-rw-r--r--linden/indra/newview/llworld.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 4dee103..04f9e25 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.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
@@ -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}