diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llvowlsky.cpp | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llvowlsky.cpp')
-rw-r--r-- | linden/indra/newview/llvowlsky.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp index 159603e..8f9b58b 100644 --- a/linden/indra/newview/llvowlsky.cpp +++ b/linden/indra/newview/llvowlsky.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2007-2008, Linden Research, Inc. | 7 | * Copyright (c) 2007-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 |
@@ -87,7 +87,7 @@ inline U32 LLVOWLSky::getStarsNumIndices(void) | |||
87 | } | 87 | } |
88 | 88 | ||
89 | LLVOWLSky::LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) | 89 | LLVOWLSky::LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) |
90 | : LLStaticViewerObject(id, pcode, regionp) | 90 | : LLStaticViewerObject(id, pcode, regionp, TRUE) |
91 | { | 91 | { |
92 | initStars(); | 92 | initStars(); |
93 | } | 93 | } |
@@ -488,7 +488,7 @@ void LLVOWLSky::drawStars(void) | |||
488 | if (mStarsVerts.notNull()) | 488 | if (mStarsVerts.notNull()) |
489 | { | 489 | { |
490 | mStarsVerts->setBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK); | 490 | mStarsVerts->setBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK); |
491 | mStarsVerts->draw(LLVertexBuffer::POINTS, getStarsNumIndices(), 0); | 491 | mStarsVerts->draw(LLRender::POINTS, getStarsNumIndices(), 0); |
492 | } | 492 | } |
493 | } | 493 | } |
494 | 494 | ||
@@ -513,7 +513,7 @@ void LLVOWLSky::drawDome(void) | |||
513 | strips_segment->setBuffer(data_mask); | 513 | strips_segment->setBuffer(data_mask); |
514 | 514 | ||
515 | strips_segment->drawRange( | 515 | strips_segment->drawRange( |
516 | LLVertexBuffer::TRIANGLE_STRIP, | 516 | LLRender::TRIANGLE_STRIP, |
517 | 0, strips_segment->getRequestedVerts()-1, strips_segment->getRequestedIndices(), | 517 | 0, strips_segment->getRequestedVerts()-1, strips_segment->getRequestedIndices(), |
518 | 0); | 518 | 0); |
519 | gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices() - 2); | 519 | gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices() - 2); |