diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-22 15:04:33 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-22 15:04:33 -0700 |
| commit | aba9c25556e1a4477849fd81b81420c3e322e3f7 (patch) | |
| tree | 3b6e801468f3858d6031631848fffb57b5d8708d /indra/newview/llface.inl | |
| parent | eb5a6192556e523707c0e4cd077e3a3dbcf1d352 (diff) | |
| parent | b8ce05ed08a7db0825c04c217888814ef523027a (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llface.inl')
| -rw-r--r-- | indra/newview/llface.inl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llface.inl b/indra/newview/llface.inl index 38f38f5466..176c73e38e 100644 --- a/indra/newview/llface.inl +++ b/indra/newview/llface.inl @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2001&license=viewergpl$ * - * Copyright (c) 2001-2007, Linden Research, Inc. + * Copyright (c) 2001-2009, Linden Research, Inc. * * Second Life Viewer Source Code * The source code in this file ("Source Code") is provided by Linden Lab @@ -12,12 +12,13 @@ * ("GPL"), unless you have obtained a separate licensing agreement * ("Other License"), formally executed by you and Linden Lab. Terms of * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlife.com/developers/opensource/gplv2 + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * * There are special exceptions to the terms and conditions of the GPL as * it is applied to this Source Code. View the full text of the exception * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlife.com/developers/opensource/flossexception + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * * By copying, modifying or distributing this software, you acknowledge * that you have read and understood your obligations described above, |