diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
| commit | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (patch) | |
| tree | b4053044a9d9f95aa7fea445ce8873ae744f74b1 /indra/newview/pipeline.h | |
| parent | 3cb97cb4d75c40d9519d796dd52d0741d354fc97 (diff) | |
| parent | c494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 074c1742e2..0cf3fde562 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -208,7 +208,7 @@ public: BOOL visibleObjectsInFrustum(LLCamera& camera); BOOL getVisibleExtents(LLCamera& camera, LLVector3 &min, LLVector3& max); BOOL getVisiblePointCloud(LLCamera& camera, LLVector3 &min, LLVector3& max, std::vector<LLVector3>& fp, LLVector3 light_dir = LLVector3(0,0,0)); - void updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip = 0); //if water_clip is 0, ignore water plane, 1, cull to above plane, -1, cull to below plane + void updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip = 0, LLPlane* plane = NULL); //if water_clip is 0, ignore water plane, 1, cull to above plane, -1, cull to below plane void createObjects(F32 max_dtime); void createObject(LLViewerObject* vobj); void updateGeom(F32 max_dtime); |