diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
| commit | 446c55538e1fb12d8a1feb541edf99c16bb29121 (patch) | |
| tree | 022ca3c10bd2e0326098719cdffb65f9465ab08f /indra/newview/llhudicon.h | |
| parent | 5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff) | |
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'indra/newview/llhudicon.h')
| -rw-r--r-- | indra/newview/llhudicon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h index ffc2985f88..154e6df518 100644 --- a/indra/newview/llhudicon.h +++ b/indra/newview/llhudicon.h @@ -68,6 +68,7 @@ public: static S32 generatePickIDs(S32 start_id, S32 step_size); static LLHUDIcon* handlePick(S32 pick_id); + static LLHUDIcon* lineSegmentIntersectAll(const LLVector3& start, const LLVector3& end, LLVector3* intersection); static void updateAll(); static void cleanupDeadIcons(); @@ -78,6 +79,8 @@ public: BOOL getHidden() const { return mHidden; } void setHidden( BOOL hide ) { mHidden = hide; } + BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3* intersection); + protected: LLHUDIcon(const U8 type); ~LLHUDIcon(); |