Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

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 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,7 +87,7 @@ inline U32 LLVOWLSky::getStarsNumIndices(void)
 }
 
 LLVOWLSky::LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-        : LLStaticViewerObject(id, pcode, regionp)
+        : LLStaticViewerObject(id, pcode, regionp, TRUE)
 {
         initStars();
 }
@@ -488,7 +488,7 @@ void LLVOWLSky::drawStars(void)
         if (mStarsVerts.notNull())
         {
                 mStarsVerts->setBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK);
-                mStarsVerts->draw(LLVertexBuffer::POINTS, getStarsNumIndices(), 0);
+                mStarsVerts->draw(LLRender::POINTS, getStarsNumIndices(), 0);
         }
 }
 
@@ -513,7 +513,7 @@ void LLVOWLSky::drawDome(void)
                 strips_segment->setBuffer(data_mask);
 
                 strips_segment->drawRange(
-                        LLVertexBuffer::TRIANGLE_STRIP, 
+                        LLRender::TRIANGLE_STRIP, 
                         0, strips_segment->getRequestedVerts()-1, strips_segment->getRequestedIndices(), 
                         0);
                 gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices() - 2);