aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-01 03:36:02 -0700
committerMcCabe Maxsted2010-09-25 08:15:52 -0700
commit7042b6caff21c678524b94ef57455563bc17fb43 (patch)
tree63ca90be30a1a1bb8ece0a968156300dc810c122 /linden/indra/newview/llviewerobject.h
parentApplied patch by Aleric Inglewood for VWR-12984: Water flickers and disappear... (diff)
downloadmeta-impy-7042b6caff21c678524b94ef57455563bc17fb43.zip
meta-impy-7042b6caff21c678524b94ef57455563bc17fb43.tar.gz
meta-impy-7042b6caff21c678524b94ef57455563bc17fb43.tar.bz2
meta-impy-7042b6caff21c678524b94ef57455563bc17fb43.tar.xz
Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 3: Collapse LL_VO_HOLE_WATER and LL_VO_EDGE_WATER into one LL_VO_VOID_WATER
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerobject.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index c443441..33e8da2 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -509,13 +509,12 @@ public:
509 LL_VO_WL_SKY = LL_PCODE_APP | 0x40, 509 LL_VO_WL_SKY = LL_PCODE_APP | 0x40,
510 LL_VO_SQUARE_TORUS = LL_PCODE_APP | 0x50, 510 LL_VO_SQUARE_TORUS = LL_PCODE_APP | 0x50,
511 LL_VO_SKY = LL_PCODE_APP | 0x60, 511 LL_VO_SKY = LL_PCODE_APP | 0x60,
512 LL_VO_EDGE_WATER = LL_PCODE_APP | 0x70, 512 LL_VO_VOID_WATER = LL_PCODE_APP | 0x70,
513 LL_VO_HOLE_WATER = LL_PCODE_APP | 0x80, 513 LL_VO_WATER = LL_PCODE_APP | 0x80,
514 LL_VO_WATER = LL_PCODE_APP | 0x90, 514 LL_VO_GROUND = LL_PCODE_APP | 0x90,
515 LL_VO_GROUND = LL_PCODE_APP | 0xa0, 515 LL_VO_PART_GROUP = LL_PCODE_APP | 0xa0,
516 LL_VO_PART_GROUP = LL_PCODE_APP | 0xb0, 516 LL_VO_TRIANGLE_TORUS = LL_PCODE_APP | 0xb0,
517 LL_VO_TRIANGLE_TORUS = LL_PCODE_APP | 0xc0, 517 LL_VO_HUD_PART_GROUP = LL_PCODE_APP | 0xc0,
518 LL_VO_HUD_PART_GROUP = LL_PCODE_APP | 0xd0,
519 } EVOType; 518 } EVOType;
520 519
521 LLUUID mID; 520 LLUUID mID;