diff options
| author | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
| commit | a8a62201ba762e98dff92cf49033e577fc34d8d4 (patch) | |
| tree | 11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/llmath | |
| parent | Second Life viewer sources 1.18.6.4-RC (diff) | |
| download | meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2 meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz | |
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/llmath')
60 files changed, 603 insertions, 123 deletions
diff --git a/linden/indra/llmath/camera.h b/linden/indra/llmath/camera.h index cc3737d..8ac8fdc 100644 --- a/linden/indra/llmath/camera.h +++ b/linden/indra/llmath/camera.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/coordframe.h b/linden/indra/llmath/coordframe.h index 7cb9d6f..c1b16f8 100644 --- a/linden/indra/llmath/coordframe.h +++ b/linden/indra/llmath/coordframe.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llbboxlocal.cpp b/linden/indra/llmath/llbboxlocal.cpp index e10b1e9..212e276 100644 --- a/linden/indra/llmath/llbboxlocal.cpp +++ b/linden/indra/llmath/llbboxlocal.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, |
diff --git a/linden/indra/llmath/llbboxlocal.h b/linden/indra/llmath/llbboxlocal.h index d6c177a..e7a61ce 100644 --- a/linden/indra/llmath/llbboxlocal.h +++ b/linden/indra/llmath/llbboxlocal.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp index 41f6125..82c401f 100644 --- a/linden/indra/llmath/llcamera.cpp +++ b/linden/indra/llmath/llcamera.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, |
diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h index bc7f064..0e20798 100644 --- a/linden/indra/llmath/llcamera.h +++ b/linden/indra/llmath/llcamera.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llcoord.h b/linden/indra/llmath/llcoord.h index d23cd16..1fa1151 100644 --- a/linden/indra/llmath/llcoord.h +++ b/linden/indra/llmath/llcoord.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llcoordframe.cpp b/linden/indra/llmath/llcoordframe.cpp index 8302b05..6d18c8b 100644 --- a/linden/indra/llmath/llcoordframe.cpp +++ b/linden/indra/llmath/llcoordframe.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, |
diff --git a/linden/indra/llmath/llcoordframe.h b/linden/indra/llmath/llcoordframe.h index e8b9279..ce14fd7 100644 --- a/linden/indra/llmath/llcoordframe.h +++ b/linden/indra/llmath/llcoordframe.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llcrc.cpp b/linden/indra/llmath/llcrc.cpp index ebf5d25..2338691 100644 --- a/linden/indra/llmath/llcrc.cpp +++ b/linden/indra/llmath/llcrc.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, |
diff --git a/linden/indra/llmath/llcrc.h b/linden/indra/llmath/llcrc.h index 18f57db..64e939c 100644 --- a/linden/indra/llmath/llcrc.h +++ b/linden/indra/llmath/llcrc.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llinterp.h b/linden/indra/llmath/llinterp.h index 832ba49..ec5458f 100644 --- a/linden/indra/llmath/llinterp.h +++ b/linden/indra/llmath/llinterp.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h index be3ed40..affdbf1 100644 --- a/linden/indra/llmath/llmath.h +++ b/linden/indra/llmath/llmath.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llmath_vc9.vcproj b/linden/indra/llmath/llmath_vc9.vcproj new file mode 100644 index 0000000..1f6d05b --- /dev/null +++ b/linden/indra/llmath/llmath_vc9.vcproj | |||
| @@ -0,0 +1,473 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="9.00" | ||
| 5 | Name="llmath" | ||
| 6 | ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}" | ||
| 7 | RootNamespace="llmath" | ||
| 8 | Keyword="Win32Proj" | ||
| 9 | TargetFrameworkVersion="131072" | ||
| 10 | > | ||
| 11 | <Platforms> | ||
| 12 | <Platform | ||
| 13 | Name="Win32" | ||
| 14 | /> | ||
| 15 | </Platforms> | ||
| 16 | <ToolFiles> | ||
| 17 | </ToolFiles> | ||
| 18 | <Configurations> | ||
| 19 | <Configuration | ||
| 20 | Name="Debug|Win32" | ||
| 21 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
| 22 | IntermediateDirectory="$(ConfigurationName)" | ||
| 23 | ConfigurationType="4" | ||
| 24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
| 25 | CharacterSet="1" | ||
| 26 | > | ||
| 27 | <Tool | ||
| 28 | Name="VCPreBuildEventTool" | ||
| 29 | /> | ||
| 30 | <Tool | ||
| 31 | Name="VCCustomBuildTool" | ||
| 32 | /> | ||
| 33 | <Tool | ||
| 34 | Name="VCXMLDataGeneratorTool" | ||
| 35 | /> | ||
| 36 | <Tool | ||
| 37 | Name="VCWebServiceProxyGeneratorTool" | ||
| 38 | /> | ||
| 39 | <Tool | ||
| 40 | Name="VCMIDLTool" | ||
| 41 | /> | ||
| 42 | <Tool | ||
| 43 | Name="VCCLCompilerTool" | ||
| 44 | Optimization="0" | ||
| 45 | AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
| 46 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" | ||
| 47 | MinimalRebuild="true" | ||
| 48 | BasicRuntimeChecks="3" | ||
| 49 | RuntimeLibrary="1" | ||
| 50 | StructMemberAlignment="4" | ||
| 51 | TreatWChar_tAsBuiltInType="false" | ||
| 52 | ForceConformanceInForLoopScope="true" | ||
| 53 | UsePrecompiledHeader="0" | ||
| 54 | WarningLevel="3" | ||
| 55 | WarnAsError="true" | ||
| 56 | Detect64BitPortabilityProblems="false" | ||
| 57 | DebugInformationFormat="4" | ||
| 58 | /> | ||
| 59 | <Tool | ||
| 60 | Name="VCManagedResourceCompilerTool" | ||
| 61 | /> | ||
| 62 | <Tool | ||
| 63 | Name="VCResourceCompilerTool" | ||
| 64 | /> | ||
| 65 | <Tool | ||
| 66 | Name="VCPreLinkEventTool" | ||
| 67 | /> | ||
| 68 | <Tool | ||
| 69 | Name="VCLibrarianTool" | ||
| 70 | OutputFile="$(OutDir)/llmath.lib" | ||
| 71 | /> | ||
| 72 | <Tool | ||
| 73 | Name="VCALinkTool" | ||
| 74 | /> | ||
| 75 | <Tool | ||
| 76 | Name="VCXDCMakeTool" | ||
| 77 | /> | ||
| 78 | <Tool | ||
| 79 | Name="VCBscMakeTool" | ||
| 80 | /> | ||
| 81 | <Tool | ||
| 82 | Name="VCFxCopTool" | ||
| 83 | /> | ||
| 84 | <Tool | ||
| 85 | Name="VCPostBuildEventTool" | ||
| 86 | /> | ||
| 87 | </Configuration> | ||
| 88 | <Configuration | ||
| 89 | Name="Release|Win32" | ||
| 90 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
| 91 | IntermediateDirectory="$(ConfigurationName)" | ||
| 92 | ConfigurationType="4" | ||
| 93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
| 94 | CharacterSet="1" | ||
| 95 | > | ||
| 96 | <Tool | ||
| 97 | Name="VCPreBuildEventTool" | ||
| 98 | /> | ||
| 99 | <Tool | ||
| 100 | Name="VCCustomBuildTool" | ||
| 101 | /> | ||
| 102 | <Tool | ||
| 103 | Name="VCXMLDataGeneratorTool" | ||
| 104 | /> | ||
| 105 | <Tool | ||
| 106 | Name="VCWebServiceProxyGeneratorTool" | ||
| 107 | /> | ||
| 108 | <Tool | ||
| 109 | Name="VCMIDLTool" | ||
| 110 | /> | ||
| 111 | <Tool | ||
| 112 | Name="VCCLCompilerTool" | ||
| 113 | AdditionalOptions="/Oy-" | ||
| 114 | AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
| 115 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | ||
| 116 | RuntimeLibrary="0" | ||
| 117 | StructMemberAlignment="0" | ||
| 118 | TreatWChar_tAsBuiltInType="false" | ||
| 119 | ForceConformanceInForLoopScope="true" | ||
| 120 | UsePrecompiledHeader="0" | ||
| 121 | WarningLevel="3" | ||
| 122 | WarnAsError="true" | ||
| 123 | Detect64BitPortabilityProblems="false" | ||
| 124 | DebugInformationFormat="3" | ||
| 125 | /> | ||
| 126 | <Tool | ||
| 127 | Name="VCManagedResourceCompilerTool" | ||
| 128 | /> | ||
| 129 | <Tool | ||
| 130 | Name="VCResourceCompilerTool" | ||
| 131 | /> | ||
| 132 | <Tool | ||
| 133 | Name="VCPreLinkEventTool" | ||
| 134 | /> | ||
| 135 | <Tool | ||
| 136 | Name="VCLibrarianTool" | ||
| 137 | OutputFile="$(OutDir)/llmath.lib" | ||
| 138 | /> | ||
| 139 | <Tool | ||
| 140 | Name="VCALinkTool" | ||
| 141 | /> | ||
| 142 | <Tool | ||
| 143 | Name="VCXDCMakeTool" | ||
| 144 | /> | ||
| 145 | <Tool | ||
| 146 | Name="VCBscMakeTool" | ||
| 147 | /> | ||
| 148 | <Tool | ||
| 149 | Name="VCFxCopTool" | ||
| 150 | /> | ||
| 151 | <Tool | ||
| 152 | Name="VCPostBuildEventTool" | ||
| 153 | /> | ||
| 154 | </Configuration> | ||
| 155 | <Configuration | ||
| 156 | Name="ReleaseNoOpt|Win32" | ||
| 157 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
| 158 | IntermediateDirectory="$(ConfigurationName)" | ||
| 159 | ConfigurationType="4" | ||
| 160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
| 161 | CharacterSet="1" | ||
| 162 | > | ||
| 163 | <Tool | ||
| 164 | Name="VCPreBuildEventTool" | ||
| 165 | /> | ||
| 166 | <Tool | ||
| 167 | Name="VCCustomBuildTool" | ||
| 168 | /> | ||
| 169 | <Tool | ||
| 170 | Name="VCXMLDataGeneratorTool" | ||
| 171 | /> | ||
| 172 | <Tool | ||
| 173 | Name="VCWebServiceProxyGeneratorTool" | ||
| 174 | /> | ||
| 175 | <Tool | ||
| 176 | Name="VCMIDLTool" | ||
| 177 | /> | ||
| 178 | <Tool | ||
| 179 | Name="VCCLCompilerTool" | ||
| 180 | AdditionalOptions="/Oy-" | ||
| 181 | Optimization="0" | ||
| 182 | AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
| 183 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | ||
| 184 | RuntimeLibrary="0" | ||
| 185 | StructMemberAlignment="0" | ||
| 186 | TreatWChar_tAsBuiltInType="false" | ||
| 187 | ForceConformanceInForLoopScope="true" | ||
| 188 | UsePrecompiledHeader="0" | ||
| 189 | BrowseInformation="0" | ||
| 190 | WarningLevel="3" | ||
| 191 | WarnAsError="true" | ||
| 192 | Detect64BitPortabilityProblems="false" | ||
| 193 | DebugInformationFormat="3" | ||
| 194 | /> | ||
| 195 | <Tool | ||
| 196 | Name="VCManagedResourceCompilerTool" | ||
| 197 | /> | ||
| 198 | <Tool | ||
| 199 | Name="VCResourceCompilerTool" | ||
| 200 | /> | ||
| 201 | <Tool | ||
| 202 | Name="VCPreLinkEventTool" | ||
| 203 | /> | ||
| 204 | <Tool | ||
| 205 | Name="VCLibrarianTool" | ||
| 206 | OutputFile="$(OutDir)/llmath.lib" | ||
| 207 | /> | ||
| 208 | <Tool | ||
| 209 | Name="VCALinkTool" | ||
| 210 | /> | ||
| 211 | <Tool | ||
| 212 | Name="VCXDCMakeTool" | ||
| 213 | /> | ||
| 214 | <Tool | ||
| 215 | Name="VCBscMakeTool" | ||
| 216 | /> | ||
| 217 | <Tool | ||
| 218 | Name="VCFxCopTool" | ||
| 219 | /> | ||
| 220 | <Tool | ||
| 221 | Name="VCPostBuildEventTool" | ||
| 222 | /> | ||
| 223 | </Configuration> | ||
| 224 | </Configurations> | ||
| 225 | <References> | ||
| 226 | </References> | ||
| 227 | <Files> | ||
| 228 | <Filter | ||
| 229 | Name="Source Files" | ||
| 230 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
| 231 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
| 232 | > | ||
| 233 | <File | ||
| 234 | RelativePath=".\llbboxlocal.cpp" | ||
| 235 | > | ||
| 236 | </File> | ||
| 237 | <File | ||
| 238 | RelativePath=".\llcamera.cpp" | ||
| 239 | > | ||
| 240 | </File> | ||
| 241 | <File | ||
| 242 | RelativePath=".\llcoordframe.cpp" | ||
| 243 | > | ||
| 244 | </File> | ||
| 245 | <File | ||
| 246 | RelativePath=".\llcrc.cpp" | ||
| 247 | > | ||
| 248 | </File> | ||
| 249 | <File | ||
| 250 | RelativePath=".\llmd5.cpp" | ||
| 251 | > | ||
| 252 | </File> | ||
| 253 | <File | ||
| 254 | RelativePath=".\llperlin.cpp" | ||
| 255 | > | ||
| 256 | </File> | ||
| 257 | <File | ||
| 258 | RelativePath=".\llquaternion.cpp" | ||
| 259 | > | ||
| 260 | </File> | ||
| 261 | <File | ||
| 262 | RelativePath=".\llrand.cpp" | ||
| 263 | > | ||
| 264 | </File> | ||
| 265 | <File | ||
| 266 | RelativePath=".\llrect.cpp" | ||
| 267 | > | ||
| 268 | </File> | ||
| 269 | <File | ||
| 270 | RelativePath=".\lluuid.cpp" | ||
| 271 | > | ||
| 272 | </File> | ||
| 273 | <File | ||
| 274 | RelativePath=".\llvolume.cpp" | ||
| 275 | > | ||
| 276 | </File> | ||
| 277 | <File | ||
| 278 | RelativePath=".\llvolumemgr.cpp" | ||
| 279 | > | ||
| 280 | </File> | ||
| 281 | <File | ||
| 282 | RelativePath=".\m3math.cpp" | ||
| 283 | > | ||
| 284 | </File> | ||
| 285 | <File | ||
| 286 | RelativePath=".\m4math.cpp" | ||
| 287 | > | ||
| 288 | </File> | ||
| 289 | <File | ||
| 290 | RelativePath=".\raytrace.cpp" | ||
| 291 | > | ||
| 292 | </File> | ||
| 293 | <File | ||
| 294 | RelativePath=".\v2math.cpp" | ||
| 295 | > | ||
| 296 | </File> | ||
| 297 | <File | ||
| 298 | RelativePath=".\v3color.cpp" | ||
| 299 | > | ||
| 300 | </File> | ||
| 301 | <File | ||
| 302 | RelativePath=".\v3dmath.cpp" | ||
| 303 | > | ||
| 304 | </File> | ||
| 305 | <File | ||
| 306 | RelativePath=".\v3math.cpp" | ||
| 307 | > | ||
| 308 | </File> | ||
| 309 | <File | ||
| 310 | RelativePath=".\v4color.cpp" | ||
| 311 | > | ||
| 312 | </File> | ||
| 313 | <File | ||
| 314 | RelativePath=".\v4coloru.cpp" | ||
| 315 | > | ||
| 316 | </File> | ||
| 317 | <File | ||
| 318 | RelativePath=".\v4math.cpp" | ||
| 319 | > | ||
| 320 | </File> | ||
| 321 | <File | ||
| 322 | RelativePath=".\xform.cpp" | ||
| 323 | > | ||
| 324 | </File> | ||
| 325 | </Filter> | ||
| 326 | <Filter | ||
| 327 | Name="Header Files" | ||
| 328 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
| 329 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
| 330 | > | ||
| 331 | <File | ||
| 332 | RelativePath=".\llbboxlocal.h" | ||
| 333 | > | ||
| 334 | </File> | ||
| 335 | <File | ||
| 336 | RelativePath=".\llcamera.h" | ||
| 337 | > | ||
| 338 | </File> | ||
| 339 | <File | ||
| 340 | RelativePath=".\llcoord.h" | ||
| 341 | > | ||
| 342 | </File> | ||
| 343 | <File | ||
| 344 | RelativePath=".\llcoordframe.h" | ||
| 345 | > | ||
| 346 | </File> | ||
| 347 | <File | ||
| 348 | RelativePath=".\llcrc.h" | ||
| 349 | > | ||
| 350 | </File> | ||
| 351 | <File | ||
| 352 | RelativePath=".\llinterp.h" | ||
| 353 | > | ||
| 354 | </File> | ||
| 355 | <File | ||
| 356 | RelativePath=".\llmath.h" | ||
| 357 | > | ||
| 358 | </File> | ||
| 359 | <File | ||
| 360 | RelativePath=".\llmd5.h" | ||
| 361 | > | ||
| 362 | </File> | ||
| 363 | <File | ||
| 364 | RelativePath=".\lloctree.h" | ||
| 365 | > | ||
| 366 | </File> | ||
| 367 | <File | ||
| 368 | RelativePath=".\llperlin.h" | ||
| 369 | > | ||
| 370 | </File> | ||
| 371 | <File | ||
| 372 | RelativePath=".\llquantize.h" | ||
| 373 | > | ||
| 374 | </File> | ||
| 375 | <File | ||
| 376 | RelativePath=".\llquaternion.h" | ||
| 377 | > | ||
| 378 | </File> | ||
| 379 | <File | ||
| 380 | RelativePath=".\llrand.h" | ||
| 381 | > | ||
| 382 | </File> | ||
| 383 | <File | ||
| 384 | RelativePath=".\llrect.h" | ||
| 385 | > | ||
| 386 | </File> | ||
| 387 | <File | ||
| 388 | RelativePath=".\lltreenode.h" | ||
| 389 | > | ||
| 390 | </File> | ||
| 391 | <File | ||
| 392 | RelativePath=".\lluuid.h" | ||
| 393 | > | ||
| 394 | </File> | ||
| 395 | <File | ||
| 396 | RelativePath=".\llv4math.h" | ||
| 397 | > | ||
| 398 | </File> | ||
| 399 | <File | ||
| 400 | RelativePath=".\llv4matrix3.h" | ||
| 401 | > | ||
| 402 | </File> | ||
| 403 | <File | ||
| 404 | RelativePath=".\llv4matrix4.h" | ||
| 405 | > | ||
| 406 | </File> | ||
| 407 | <File | ||
| 408 | RelativePath=".\llv4vector3.h" | ||
| 409 | > | ||
| 410 | </File> | ||
| 411 | <File | ||
| 412 | RelativePath=".\llvolume.h" | ||
| 413 | > | ||
| 414 | </File> | ||
| 415 | <File | ||
| 416 | RelativePath=".\llvolumemgr.h" | ||
| 417 | > | ||
| 418 | </File> | ||
| 419 | <File | ||
| 420 | RelativePath=".\m3math.h" | ||
| 421 | > | ||
| 422 | </File> | ||
| 423 | <File | ||
| 424 | RelativePath=".\m4math.h" | ||
| 425 | > | ||
| 426 | </File> | ||
| 427 | <File | ||
| 428 | RelativePath=".\raytrace.h" | ||
| 429 | > | ||
| 430 | </File> | ||
| 431 | <File | ||
| 432 | RelativePath=".\v2math.h" | ||
| 433 | > | ||
| 434 | </File> | ||
| 435 | <File | ||
| 436 | RelativePath=".\v3color.h" | ||
| 437 | > | ||
| 438 | </File> | ||
| 439 | <File | ||
| 440 | RelativePath=".\v3dmath.h" | ||
| 441 | > | ||
| 442 | </File> | ||
| 443 | <File | ||
| 444 | RelativePath=".\v3math.h" | ||
| 445 | > | ||
| 446 | </File> | ||
| 447 | <File | ||
| 448 | RelativePath=".\v4color.h" | ||
| 449 | > | ||
| 450 | </File> | ||
| 451 | <File | ||
| 452 | RelativePath=".\v4coloru.h" | ||
| 453 | > | ||
| 454 | </File> | ||
| 455 | <File | ||
| 456 | RelativePath=".\v4math.h" | ||
| 457 | > | ||
| 458 | </File> | ||
| 459 | <File | ||
| 460 | RelativePath=".\xform.h" | ||
| 461 | > | ||
| 462 | </File> | ||
| 463 | </Filter> | ||
| 464 | <Filter | ||
| 465 | Name="Resource Files" | ||
| 466 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
| 467 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
| 468 | > | ||
| 469 | </Filter> | ||
| 470 | </Files> | ||
| 471 | <Globals> | ||
| 472 | </Globals> | ||
| 473 | </VisualStudioProject> | ||
diff --git a/linden/indra/llmath/llmd5.cpp b/linden/indra/llmath/llmd5.cpp index 62ec2d1..a0ac92f 100644 --- a/linden/indra/llmath/llmd5.cpp +++ b/linden/indra/llmath/llmd5.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llmd5.h b/linden/indra/llmath/llmd5.h index 440051b..6d21b31 100644 --- a/linden/indra/llmath/llmd5.h +++ b/linden/indra/llmath/llmd5.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h index 96e8c76..6eee9fb 100644 --- a/linden/indra/llmath/lloctree.h +++ b/linden/indra/llmath/lloctree.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llperlin.cpp b/linden/indra/llmath/llperlin.cpp index 8e117e3..2b53914 100644 --- a/linden/indra/llmath/llperlin.cpp +++ b/linden/indra/llmath/llperlin.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llperlin.h b/linden/indra/llmath/llperlin.h index b539eab..27585f7 100644 --- a/linden/indra/llmath/llperlin.h +++ b/linden/indra/llmath/llperlin.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llplane.h b/linden/indra/llmath/llplane.h index 2d6fe4f..51a972e 100644 --- a/linden/indra/llmath/llplane.h +++ b/linden/indra/llmath/llplane.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llquantize.h b/linden/indra/llmath/llquantize.h index bb7da07..e09b80e 100644 --- a/linden/indra/llmath/llquantize.h +++ b/linden/indra/llmath/llquantize.h | |||
| @@ -13,12 +13,12 @@ | |||
| 13 | * ("GPL"), unless you have obtained a separate licensing agreement | 13 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 16 | * online at http://secondlife.com/developers/opensource/gplv2 | 16 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 17 | * | 17 | * |
| 18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
| 19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
| 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 21 | * online at http://secondlife.com/developers/opensource/flossexception | 21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 22 | * | 22 | * |
| 23 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
| 24 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp index 46702da..ea51e28 100644 --- a/linden/indra/llmath/llquaternion.cpp +++ b/linden/indra/llmath/llquaternion.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, |
diff --git a/linden/indra/llmath/llquaternion.h b/linden/indra/llmath/llquaternion.h index 526bc58..6805437 100644 --- a/linden/indra/llmath/llquaternion.h +++ b/linden/indra/llmath/llquaternion.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp index 9b5dfbf..bc8c867 100644 --- a/linden/indra/llmath/llrand.cpp +++ b/linden/indra/llmath/llrand.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, |
diff --git a/linden/indra/llmath/llrand.h b/linden/indra/llmath/llrand.h index 87f9e69..0a28213 100644 --- a/linden/indra/llmath/llrand.h +++ b/linden/indra/llmath/llrand.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llrect.cpp b/linden/indra/llmath/llrect.cpp index 669951b..41f9e67 100644 --- a/linden/indra/llmath/llrect.cpp +++ b/linden/indra/llmath/llrect.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h index 214d552..76b5a27 100644 --- a/linden/indra/llmath/llrect.h +++ b/linden/indra/llmath/llrect.h | |||
| @@ -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, |
| @@ -215,7 +215,12 @@ public: | |||
| 215 | mLeft = llmin(mLeft, mRight); | 215 | mLeft = llmin(mLeft, mRight); |
| 216 | mBottom = llmin(mBottom, mTop); | 216 | mBottom = llmin(mBottom, mTop); |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | bool isNull() const | ||
| 220 | { | ||
| 221 | return mLeft == mRight || mBottom == mTop; | ||
| 222 | } | ||
| 223 | |||
| 219 | void unionWith(const LLRectBase &other) | 224 | void unionWith(const LLRectBase &other) |
| 220 | { | 225 | { |
| 221 | mLeft = llmin(mLeft, other.mLeft); | 226 | mLeft = llmin(mLeft, other.mLeft); |
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h index d057b07..160a5bd 100644 --- a/linden/indra/llmath/lltreenode.h +++ b/linden/indra/llmath/lltreenode.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp index 030db93..db9e869 100644 --- a/linden/indra/llmath/lluuid.cpp +++ b/linden/indra/llmath/lluuid.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h index 4445873..190b772 100644 --- a/linden/indra/llmath/lluuid.h +++ b/linden/indra/llmath/lluuid.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llv4math.h b/linden/indra/llmath/llv4math.h index cf3148a..4cf74cd 100644 --- a/linden/indra/llmath/llv4math.h +++ b/linden/indra/llmath/llv4math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llv4matrix3.h b/linden/indra/llmath/llv4matrix3.h index fa50428..f9bdf8f 100644 --- a/linden/indra/llmath/llv4matrix3.h +++ b/linden/indra/llmath/llv4matrix3.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llv4matrix4.h b/linden/indra/llmath/llv4matrix4.h index b34691e..b76a822 100644 --- a/linden/indra/llmath/llv4matrix4.h +++ b/linden/indra/llmath/llv4matrix4.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llv4vector3.h b/linden/indra/llmath/llv4vector3.h index 4aa1114..92d08f1 100644 --- a/linden/indra/llmath/llv4vector3.h +++ b/linden/indra/llmath/llv4vector3.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index ab4efe6..3316168 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
| @@ -86,7 +86,7 @@ const S32 SCULPT_REZ_2 = 8; | |||
| 86 | const S32 SCULPT_REZ_3 = 16; | 86 | const S32 SCULPT_REZ_3 = 16; |
| 87 | const S32 SCULPT_REZ_4 = 32; | 87 | const S32 SCULPT_REZ_4 = 32; |
| 88 | 88 | ||
| 89 | const F32 SCULPT_MIN_AREA = 0.005f; | 89 | const F32 SCULPT_MIN_AREA = 0.002f; |
| 90 | 90 | ||
| 91 | BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm) | 91 | BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm) |
| 92 | { | 92 | { |
| @@ -1833,9 +1833,9 @@ inline LLVector3 sculpt_rgb_to_vector(U8 r, U8 g, U8 b) | |||
| 1833 | { | 1833 | { |
| 1834 | // maps RGB values to vector values [0..255] -> [-0.5..0.5] | 1834 | // maps RGB values to vector values [0..255] -> [-0.5..0.5] |
| 1835 | LLVector3 value; | 1835 | LLVector3 value; |
| 1836 | value.mV[VX] = r / 256.f - 0.5f; | 1836 | value.mV[VX] = r / 255.f - 0.5f; |
| 1837 | value.mV[VY] = g / 256.f - 0.5f; | 1837 | value.mV[VY] = g / 255.f - 0.5f; |
| 1838 | value.mV[VZ] = b / 256.f - 0.5f; | 1838 | value.mV[VZ] = b / 255.f - 0.5f; |
| 1839 | 1839 | ||
| 1840 | return value; | 1840 | return value; |
| 1841 | } | 1841 | } |
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h index 909fa22..7b384f2 100644 --- a/linden/indra/llmath/llvolume.h +++ b/linden/indra/llmath/llvolume.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp index 3aa6b3c..17bafcd 100644 --- a/linden/indra/llmath/llvolumemgr.cpp +++ b/linden/indra/llmath/llvolumemgr.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h index c5ee6b0..0688163 100644 --- a/linden/indra/llmath/llvolumemgr.h +++ b/linden/indra/llmath/llvolumemgr.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/m3math.cpp b/linden/indra/llmath/m3math.cpp index 007f0cf..6741f05 100644 --- a/linden/indra/llmath/m3math.cpp +++ b/linden/indra/llmath/m3math.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, |
diff --git a/linden/indra/llmath/m3math.h b/linden/indra/llmath/m3math.h index 42562e6..8bd94d8 100644 --- a/linden/indra/llmath/m3math.h +++ b/linden/indra/llmath/m3math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/m4math.cpp b/linden/indra/llmath/m4math.cpp index 62da38f..2b51db1 100644 --- a/linden/indra/llmath/m4math.cpp +++ b/linden/indra/llmath/m4math.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, |
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h index 780ddb2..7a51eb2 100644 --- a/linden/indra/llmath/m4math.h +++ b/linden/indra/llmath/m4math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/raytrace.cpp b/linden/indra/llmath/raytrace.cpp index b4fa92b..a3049cd 100644 --- a/linden/indra/llmath/raytrace.cpp +++ b/linden/indra/llmath/raytrace.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, |
diff --git a/linden/indra/llmath/raytrace.h b/linden/indra/llmath/raytrace.h index d0c809e..9499f84 100644 --- a/linden/indra/llmath/raytrace.h +++ b/linden/indra/llmath/raytrace.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/v2math.cpp b/linden/indra/llmath/v2math.cpp index a4a50fc..76fa60f 100644 --- a/linden/indra/llmath/v2math.cpp +++ b/linden/indra/llmath/v2math.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, |
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h index 756de94..b951786 100644 --- a/linden/indra/llmath/v2math.h +++ b/linden/indra/llmath/v2math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/v3color.cpp b/linden/indra/llmath/v3color.cpp index e33d842..cc4f874 100644 --- a/linden/indra/llmath/v3color.cpp +++ b/linden/indra/llmath/v3color.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, |
diff --git a/linden/indra/llmath/v3color.h b/linden/indra/llmath/v3color.h index 29f41c1..782ccd7 100644 --- a/linden/indra/llmath/v3color.h +++ b/linden/indra/llmath/v3color.h | |||
| @@ -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, |
| @@ -163,6 +163,7 @@ inline LLColor3::LLColor3(F32 r, F32 g, F32 b) | |||
| 163 | mV[VZ] = b; | 163 | mV[VZ] = b; |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | |||
| 166 | inline LLColor3::LLColor3(const F32 *vec) | 167 | inline LLColor3::LLColor3(const F32 *vec) |
| 167 | { | 168 | { |
| 168 | mV[VX] = vec[VX]; | 169 | mV[VX] = vec[VX]; |
diff --git a/linden/indra/llmath/v3dmath.cpp b/linden/indra/llmath/v3dmath.cpp index d3f9478..b59f519 100644 --- a/linden/indra/llmath/v3dmath.cpp +++ b/linden/indra/llmath/v3dmath.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, |
diff --git a/linden/indra/llmath/v3dmath.h b/linden/indra/llmath/v3dmath.h index f5a016e..60757ba 100644 --- a/linden/indra/llmath/v3dmath.h +++ b/linden/indra/llmath/v3dmath.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp index 2eeef52..34cce06 100644 --- a/linden/indra/llmath/v3math.cpp +++ b/linden/indra/llmath/v3math.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, |
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h index 534f0e6..f1c1b39 100644 --- a/linden/indra/llmath/v3math.h +++ b/linden/indra/llmath/v3math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/v4color.cpp b/linden/indra/llmath/v4color.cpp index e8d59fc..b1884b7 100644 --- a/linden/indra/llmath/v4color.cpp +++ b/linden/indra/llmath/v4color.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, |
diff --git a/linden/indra/llmath/v4color.h b/linden/indra/llmath/v4color.h index ab82d22..9ba2690 100644 --- a/linden/indra/llmath/v4color.h +++ b/linden/indra/llmath/v4color.h | |||
| @@ -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, |
| @@ -260,6 +260,7 @@ inline LLColor4::LLColor4(U32 clr) | |||
| 260 | mV[VW] = (clr>>24) * (1.0f/255.0f); | 260 | mV[VW] = (clr>>24) * (1.0f/255.0f); |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | |||
| 263 | inline LLColor4::LLColor4(const F32 *vec) | 264 | inline LLColor4::LLColor4(const F32 *vec) |
| 264 | { | 265 | { |
| 265 | mV[VX] = vec[VX]; | 266 | mV[VX] = vec[VX]; |
diff --git a/linden/indra/llmath/v4coloru.cpp b/linden/indra/llmath/v4coloru.cpp index f3274b3..56a8413 100644 --- a/linden/indra/llmath/v4coloru.cpp +++ b/linden/indra/llmath/v4coloru.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, |
diff --git a/linden/indra/llmath/v4coloru.h b/linden/indra/llmath/v4coloru.h index 5c787cd..c9c5418 100644 --- a/linden/indra/llmath/v4coloru.h +++ b/linden/indra/llmath/v4coloru.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/v4math.cpp b/linden/indra/llmath/v4math.cpp index 29e180d..26a47ff 100644 --- a/linden/indra/llmath/v4math.cpp +++ b/linden/indra/llmath/v4math.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, |
diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h index 102eb26..f9d0c43 100644 --- a/linden/indra/llmath/v4math.h +++ b/linden/indra/llmath/v4math.h | |||
| @@ -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, |
diff --git a/linden/indra/llmath/xform.cpp b/linden/indra/llmath/xform.cpp index ef1ced6..d8d7991 100644 --- a/linden/indra/llmath/xform.cpp +++ b/linden/indra/llmath/xform.cpp | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h index 1e4b7ff..8fd1e9e 100644 --- a/linden/indra/llmath/xform.h +++ b/linden/indra/llmath/xform.h | |||
| @@ -11,12 +11,12 @@ | |||
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 15 | * | 15 | * |
| 16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
| 17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 20 | * | 20 | * |
| 21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
| 22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |