diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llrender/text_out.h | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerjoystick.h (renamed from linden/indra/llrender/text_out.h) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/llrender/text_out.h b/linden/indra/newview/llviewerjoystick.h index 5080bd5..ee6036f 100644 --- a/linden/indra/llrender/text_out.h +++ b/linden/indra/newview/llviewerjoystick.h | |||
@@ -1,9 +1,10 @@ | |||
1 | /** | 1 | /** |
2 | * @file text_out.h | 2 | * @file llviewerjoystick.h |
3 | * @brief Text rendering implementation | 3 | * @brief Viewer joystick functionality. |
4 | * | 4 | * |
5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -25,16 +26,15 @@ | |||
25 | * COMPLETENESS OR PERFORMANCE. | 26 | * COMPLETENESS OR PERFORMANCE. |
26 | */ | 27 | */ |
27 | 28 | ||
28 | #ifndef LL_TEXT_OUT_H | 29 | #ifndef LL_LLVIEWERJOYSTICK_H |
29 | #define LL_TEXT_OUT_H | 30 | #define LL_LLVIEWERJOYSTICK_H |
30 | 31 | ||
31 | // DEPRECATED - Use LLFontGL for raw rendering, or make an LLTextBox to hold the text | 32 | class LLViewerJoystick |
32 | 33 | { | |
33 | class LLColor4; | 34 | public: |
34 | 35 | static BOOL sOverrideCamera; | |
35 | void set_text_color(const LLColor4& color); | 36 | static void scanJoystick(); |
36 | void add_text(S32 x, S32 y, char *text); | 37 | static void updateCamera(BOOL reset = FALSE); |
37 | void show_text_gl(void); | 38 | }; |
38 | void reset_num_text_lines(void); | ||
39 | 39 | ||
40 | #endif | 40 | #endif |