1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 41c406a..a227f2d 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -511,14 +511,14 @@ public:
         {
                 LL_VO_CLOUDS =                          LL_PCODE_APP | 0x20,
                 LL_VO_SURFACE_PATCH =           LL_PCODE_APP | 0x30,
-                //LL_VO_STARS =                         LL_PCODE_APP | 0x40,
+                LL_VO_WL_SKY =                          LL_PCODE_APP | 0x40,
                 LL_VO_SQUARE_TORUS =            LL_PCODE_APP | 0x50,
                 LL_VO_SKY =                                     LL_PCODE_APP | 0x60,
-                LL_VO_WATER =                           LL_PCODE_APP | 0x70,
-                LL_VO_GROUND =                          LL_PCODE_APP | 0x80,
-                LL_VO_PART_GROUP =                      LL_PCODE_APP | 0x90,
-                LL_VO_TRIANGLE_TORUS =          LL_PCODE_APP | 0xa0,
-                LL_VO_WL_SKY =                          LL_PCODE_APP | 0xb0, // should this be moved to 0x40?
+                LL_VO_VOID_WATER =                      LL_PCODE_APP | 0x70,
+                LL_VO_WATER =                           LL_PCODE_APP | 0x80,
+                LL_VO_GROUND =                          LL_PCODE_APP | 0x90,
+                LL_VO_PART_GROUP =                      LL_PCODE_APP | 0xa0,
+                LL_VO_TRIANGLE_TORUS =          LL_PCODE_APP | 0xb0,
                 LL_VO_HUD_PART_GROUP =          LL_PCODE_APP | 0xc0,
         } EVOType;
 
@@ -718,8 +718,8 @@ public:
 class LLStaticViewerObject : public LLViewerObject
 {
 public:
-        LLStaticViewerObject(const LLUUID& id, const LLPCode type, LLViewerRegion* regionp, BOOL is_global = FALSE)
-                : LLViewerObject(id,type,regionp, is_global)
+        LLStaticViewerObject(const LLUUID& id, const LLPCode pcode, LLViewerRegion* regionp, BOOL is_global = FALSE)
+                : LLViewerObject(id, pcode, regionp, is_global)
         { }
 
         virtual void updateDrawable(BOOL force_damped);