diff options
Diffstat (limited to 'linden/indra/newview/llnameeditor.cpp')
-rw-r--r-- | linden/indra/newview/llnameeditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp index 7959867..aeb4a36 100644 --- a/linden/indra/newview/llnameeditor.cpp +++ b/linden/indra/newview/llnameeditor.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -53,7 +53,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect, | |||
53 | S32 max_text_length, | 53 | S32 max_text_length, |
54 | void (*commit_callback)(LLUICtrl* caller, void* user_data), | 54 | void (*commit_callback)(LLUICtrl* caller, void* user_data), |
55 | void (*keystroke_callback)(LLLineEditor* caller, void* user_data), | 55 | void (*keystroke_callback)(LLLineEditor* caller, void* user_data), |
56 | void (*focus_lost_callback)(LLUICtrl* caller, void* user_data), | 56 | void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data), |
57 | void* userdata, | 57 | void* userdata, |
58 | LLLinePrevalidateFunc prevalidate_func, | 58 | LLLinePrevalidateFunc prevalidate_func, |
59 | LLViewBorder::EBevel border_bevel, | 59 | LLViewBorder::EBevel border_bevel, |