diff options
author | Jacek Antonelli | 2009-01-11 16:10:39 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-11 16:10:43 -0600 |
commit | a87e38229921b48c32187c672a942516722f1b52 (patch) | |
tree | 9e1dc0bc2318a9c6fa454bdb6d873a6af0e0ce3c /linden/indra/newview/llhudicon.h | |
parent | Second Life viewer sources 1.22.4-RC (diff) | |
download | meta-impy-a87e38229921b48c32187c672a942516722f1b52.zip meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.gz meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.bz2 meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.xz |
Second Life viewer sources 1.22.5-RC
Diffstat (limited to 'linden/indra/newview/llhudicon.h')
-rw-r--r-- | linden/indra/newview/llhudicon.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llhudicon.h b/linden/indra/newview/llhudicon.h index b879776..8cd7937 100644 --- a/linden/indra/newview/llhudicon.h +++ b/linden/indra/newview/llhudicon.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2006-2008, Linden Research, Inc. | 7 | * Copyright (c) 2006-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -67,6 +67,7 @@ public: | |||
67 | 67 | ||
68 | static S32 generatePickIDs(S32 start_id, S32 step_size); | 68 | static S32 generatePickIDs(S32 start_id, S32 step_size); |
69 | static LLHUDIcon* handlePick(S32 pick_id); | 69 | static LLHUDIcon* handlePick(S32 pick_id); |
70 | static LLHUDIcon* lineSegmentIntersectAll(const LLVector3& start, const LLVector3& end, LLVector3* intersection); | ||
70 | 71 | ||
71 | static void updateAll(); | 72 | static void updateAll(); |
72 | static void cleanupDeadIcons(); | 73 | static void cleanupDeadIcons(); |
@@ -77,6 +78,8 @@ public: | |||
77 | BOOL getHidden() const { return mHidden; } | 78 | BOOL getHidden() const { return mHidden; } |
78 | void setHidden( BOOL hide ) { mHidden = hide; } | 79 | void setHidden( BOOL hide ) { mHidden = hide; } |
79 | 80 | ||
81 | BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3* intersection); | ||
82 | |||
80 | protected: | 83 | protected: |
81 | LLHUDIcon(const U8 type); | 84 | LLHUDIcon(const U8 type); |
82 | ~LLHUDIcon(); | 85 | ~LLHUDIcon(); |