diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llhudtext.h | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llhudtext.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h index 5719a19..6e29d9d 100644 --- a/linden/indra/newview/llhudtext.h +++ b/linden/indra/newview/llhudtext.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2002-2008, Linden Research, Inc. | 7 | * Copyright (c) 2002-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 |
@@ -123,6 +123,8 @@ public: | |||
123 | void setOnHUDAttachment(BOOL on_hud) { mOnHUDAttachment = on_hud; } | 123 | void setOnHUDAttachment(BOOL on_hud) { mOnHUDAttachment = on_hud; } |
124 | void shift(const LLVector3& offset); | 124 | void shift(const LLVector3& offset); |
125 | 125 | ||
126 | BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3& intersection, BOOL debug_render = FALSE); | ||
127 | |||
126 | static void shiftAll(const LLVector3& offset); | 128 | static void shiftAll(const LLVector3& offset); |
127 | static void renderAllHUD(); | 129 | static void renderAllHUD(); |
128 | static void addPickable(std::set<LLViewerObject*> &pick_list); | 130 | static void addPickable(std::set<LLViewerObject*> &pick_list); |