summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-01-25 17:29:44 -0600
committerDave Parks <davep@lindenlab.com>2013-01-25 17:29:44 -0600
commitb8f74b42a7a2d08e9c7a2dcebec58dbd07ec0328 (patch)
tree8005cf6ee51fc1d0d1b7fdce07afd908335a4f23 /indra/newview/pipeline.h
parentac6a19d456089e40d6d849a7b8aea1bc6b136c12 (diff)
MAINT-2268 Add right-click->"Mute Particle Owner" feature
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 9e113289fc..4d32e47433 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -57,6 +57,7 @@ class LLRenderFunc;
class LLCubeMap;
class LLCullResult;
class LLVOAvatar;
+class LLVOPartGroup;
class LLGLSLShader;
class LLCurlRequest;
@@ -193,6 +194,12 @@ public:
LLVector3* normal = NULL, // return the surface normal at the intersection point
LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point
);
+
+ //get the closest particle to start between start and end, returns the LLVOPartGroup and particle index
+ LLVOPartGroup* lineSegmentIntersectParticle(const LLVector3& start, const LLVector3& end, LLVector3* intersection,
+ S32* face_hit);
+
+
LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
BOOL pick_transparent,
S32* face_hit, // return the face hit