diff options
| author | McCabe Maxsted | 2010-05-01 03:36:02 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-25 08:15:52 -0700 |
| commit | 7042b6caff21c678524b94ef57455563bc17fb43 (patch) | |
| tree | 63ca90be30a1a1bb8ece0a968156300dc810c122 /linden/indra/newview/lldrawable.cpp | |
| parent | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappear... (diff) | |
| download | meta-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/lldrawable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp index 494ac5b..5a383bc 100644 --- a/linden/indra/newview/lldrawable.cpp +++ b/linden/indra/newview/lldrawable.cpp | |||
| @@ -361,8 +361,7 @@ void LLDrawable::makeActive() | |||
| 361 | { | 361 | { |
| 362 | U32 pcode = mVObjp->getPCode(); | 362 | U32 pcode = mVObjp->getPCode(); |
| 363 | if (pcode == LLViewerObject::LL_VO_WATER || | 363 | if (pcode == LLViewerObject::LL_VO_WATER || |
| 364 | pcode == LLViewerObject::LL_VO_HOLE_WATER || | 364 | pcode == LLViewerObject::LL_VO_VOID_WATER || |
| 365 | pcode == LLViewerObject::LL_VO_EDGE_WATER || | ||
| 366 | pcode == LLViewerObject::LL_VO_SURFACE_PATCH || | 365 | pcode == LLViewerObject::LL_VO_SURFACE_PATCH || |
| 367 | pcode == LLViewerObject::LL_VO_PART_GROUP || | 366 | pcode == LLViewerObject::LL_VO_PART_GROUP || |
| 368 | pcode == LLViewerObject::LL_VO_HUD_PART_GROUP || | 367 | pcode == LLViewerObject::LL_VO_HUD_PART_GROUP || |