aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-05-30 12:26:02 -0700
committerJacek Antonelli2011-06-02 22:52:51 -0500
commit0ac6387d4baf01a376525b8150c8c230fd3c2772 (patch)
tree847e552106b41f56c61e9bcee2cd8b242816049b /linden/indra/newview
parentMerge remote-tracking branch 'Kakurady/translation-zh-pub' into next (diff)
downloadmeta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.zip
meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.gz
meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.bz2
meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.xz
Fix for #903 ATI star issue, ported from Phoenix via Shoytl and Singularity
(cherry picked from commit 7d6337fb7683546c17c922aa1b0f7e3ca5982448)
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/lldrawpoolwlsky.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 451d08e..46de496 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -276,18 +276,17 @@ void LLDrawPoolWLSky::render(S32 pass)
276 LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin(); 276 LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
277 glPushMatrix(); 277 glPushMatrix();
278 278
279 glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]); 279 glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
280 280
281 // *NOTE: have to bind a texture here since register combiners blending in 281 // *NOTE: have to bind a texture here since register combiners blending in
282 // renderStars() requires something to be bound and we might as well only 282 // renderStars() requires something to be bound and we might as well only
283 // bind the moon's texture once. 283 // bind the moon's texture once.
284 LLImageGL * tex = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture(); 284 LLImageGL * tex = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
285 gGL.getTexUnit(0)->bind(tex); 285 gGL.getTexUnit(0)->bind(tex);
286 286
287 renderHeavenlyBodies(); 287 renderStars();
288 288
289 renderStars(); 289 renderHeavenlyBodies();
290
291 290
292 glPopMatrix(); 291 glPopMatrix();
293 292