diff options
Diffstat (limited to '')
153 files changed, 1768 insertions, 374 deletions
diff --git a/linden/indra/llcommon/bitpack.h b/linden/indra/llcommon/bitpack.h index 89c3752..74e1d0d 100644 --- a/linden/indra/llcommon/bitpack.h +++ b/linden/indra/llcommon/bitpack.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/llcommon/ctype_workaround.h b/linden/indra/llcommon/ctype_workaround.h index 3d0faaf..0b9acf9 100644 --- a/linden/indra/llcommon/ctype_workaround.h +++ b/linden/indra/llcommon/ctype_workaround.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/llcommon/doublelinkedlist.h b/linden/indra/llcommon/doublelinkedlist.h index 4e5a871..ce2493f 100644 --- a/linden/indra/llcommon/doublelinkedlist.h +++ b/linden/indra/llcommon/doublelinkedlist.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/llcommon/files.lst b/linden/indra/llcommon/files.lst index f7bf5e3..6f03155 100644 --- a/linden/indra/llcommon/files.lst +++ b/linden/indra/llcommon/files.lst | |||
| @@ -15,6 +15,7 @@ llcommon/llfile.cpp | |||
| 15 | llcommon/llfixedbuffer.cpp | 15 | llcommon/llfixedbuffer.cpp |
| 16 | llcommon/llformat.cpp | 16 | llcommon/llformat.cpp |
| 17 | llcommon/llframetimer.cpp | 17 | llcommon/llframetimer.cpp |
| 18 | llcommon/lllog.cpp | ||
| 18 | llcommon/llliveappconfig.cpp | 19 | llcommon/llliveappconfig.cpp |
| 19 | llcommon/lllivefile.cpp | 20 | llcommon/lllivefile.cpp |
| 20 | llcommon/llmemory.cpp | 21 | llcommon/llmemory.cpp |
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h index 43409ba..4a1e221 100644 --- a/linden/indra/llcommon/imageids.h +++ b/linden/indra/llcommon/imageids.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/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h index 75a83c6..6cb2e29 100644 --- a/linden/indra/llcommon/indra_constants.h +++ b/linden/indra/llcommon/indra_constants.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/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h index 79c027e..01540c1 100644 --- a/linden/indra/llcommon/linden_common.h +++ b/linden/indra/llcommon/linden_common.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/llcommon/linked_lists.h b/linden/indra/llcommon/linked_lists.h index ec168fc..5d5a707 100644 --- a/linden/indra/llcommon/linked_lists.h +++ b/linden/indra/llcommon/linked_lists.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/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h index 7c2a0ed..5757751 100644 --- a/linden/indra/llcommon/llagentconstants.h +++ b/linden/indra/llcommon/llagentconstants.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/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp index efb2ba6..5ae0727 100644 --- a/linden/indra/llcommon/llapp.cpp +++ b/linden/indra/llcommon/llapp.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/llcommon/llapp.h b/linden/indra/llcommon/llapp.h index 769c2b5..1a700cc 100644 --- a/linden/indra/llcommon/llapp.h +++ b/linden/indra/llcommon/llapp.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/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp index ca28ef0..a577cc7 100644 --- a/linden/indra/llcommon/llapr.cpp +++ b/linden/indra/llcommon/llapr.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h index 0389071..695b93e 100644 --- a/linden/indra/llcommon/llapr.h +++ b/linden/indra/llcommon/llapr.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llares.cpp b/linden/indra/llcommon/llares.cpp index ed42736..cf5ff18 100644 --- a/linden/indra/llcommon/llares.cpp +++ b/linden/indra/llcommon/llares.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llares.h b/linden/indra/llcommon/llares.h index 495a215..07957f1 100644 --- a/linden/indra/llcommon/llares.h +++ b/linden/indra/llcommon/llares.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp index db619b6..4b2a862 100644 --- a/linden/indra/llcommon/llassettype.cpp +++ b/linden/indra/llcommon/llassettype.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/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h index d18d509..f5ef05b 100644 --- a/linden/indra/llcommon/llassettype.h +++ b/linden/indra/llcommon/llassettype.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/llcommon/llassoclist.h b/linden/indra/llcommon/llassoclist.h index d289f03..78a332e 100644 --- a/linden/indra/llcommon/llassoclist.h +++ b/linden/indra/llcommon/llassoclist.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/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h index 5278b31..98ce499 100644 --- a/linden/indra/llcommon/llavatarconstants.h +++ b/linden/indra/llcommon/llavatarconstants.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/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp index 3daf7ef..0212e1f 100644 --- a/linden/indra/llcommon/llbase32.cpp +++ b/linden/indra/llcommon/llbase32.cpp | |||
| @@ -17,12 +17,12 @@ | |||
| 17 | * ("GPL"), unless you have obtained a separate licensing agreement | 17 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 18 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 18 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 19 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 19 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 20 | * online at http://secondlife.com/developers/opensource/gplv2 | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 21 | * | 21 | * |
| 22 | * There are special exceptions to the terms and conditions of the GPL as | 22 | * There are special exceptions to the terms and conditions of the GPL as |
| 23 | * it is applied to this Source Code. View the full text of the exception | 23 | * it is applied to this Source Code. View the full text of the exception |
| 24 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 24 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 25 | * online at http://secondlife.com/developers/opensource/flossexception | 25 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 26 | * | 26 | * |
| 27 | * By copying, modifying or distributing this software, you acknowledge | 27 | * By copying, modifying or distributing this software, you acknowledge |
| 28 | * that you have read and understood your obligations described above, | 28 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llbase32.h b/linden/indra/llcommon/llbase32.h index 7d4aad0..cb939d2 100644 --- a/linden/indra/llcommon/llbase32.h +++ b/linden/indra/llcommon/llbase32.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/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp index dffb953..950ce6e 100644 --- a/linden/indra/llcommon/llbase64.cpp +++ b/linden/indra/llcommon/llbase64.cpp | |||
| @@ -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/llcommon/llbase64.h b/linden/indra/llcommon/llbase64.h index c32a720..4101a23 100644 --- a/linden/indra/llcommon/llbase64.h +++ b/linden/indra/llcommon/llbase64.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/llcommon/llboost.h b/linden/indra/llcommon/llboost.h index 782c237..36f4daf 100644 --- a/linden/indra/llcommon/llboost.h +++ b/linden/indra/llcommon/llboost.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/llcommon/llchat.h b/linden/indra/llcommon/llchat.h index d8d33e7..a46b8aa 100644 --- a/linden/indra/llcommon/llchat.h +++ b/linden/indra/llcommon/llchat.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/llcommon/llclickaction.h b/linden/indra/llcommon/llclickaction.h index 2b95bae..20bfbfd 100644 --- a/linden/indra/llcommon/llclickaction.h +++ b/linden/indra/llcommon/llclickaction.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/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp index 27dd692..b21b687 100644 --- a/linden/indra/llcommon/llcommon.cpp +++ b/linden/indra/llcommon/llcommon.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/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h index 61a0901..4d99c3d 100644 --- a/linden/indra/llcommon/llcommon.h +++ b/linden/indra/llcommon/llcommon.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/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj index f16092b..6b4a0e8 100644 --- a/linden/indra/llcommon/llcommon.vcproj +++ b/linden/indra/llcommon/llcommon.vcproj | |||
| @@ -214,6 +214,9 @@ | |||
| 214 | RelativePath=".\lllivefile.cpp"> | 214 | RelativePath=".\lllivefile.cpp"> |
| 215 | </File> | 215 | </File> |
| 216 | <File | 216 | <File |
| 217 | RelativePath=".\lllog.cpp"> | ||
| 218 | </File> | ||
| 219 | <File | ||
| 217 | RelativePath=".\llmemory.cpp"> | 220 | RelativePath=".\llmemory.cpp"> |
| 218 | </File> | 221 | </File> |
| 219 | <File | 222 | <File |
| @@ -429,6 +432,9 @@ | |||
| 429 | RelativePath=".\lllivefile.h"> | 432 | RelativePath=".\lllivefile.h"> |
| 430 | </File> | 433 | </File> |
| 431 | <File | 434 | <File |
| 435 | RelativePath=".\lllog.h"> | ||
| 436 | </File> | ||
| 437 | <File | ||
| 432 | RelativePath=".\lllocalidhashmap.h"> | 438 | RelativePath=".\lllocalidhashmap.h"> |
| 433 | </File> | 439 | </File> |
| 434 | <File | 440 | <File |
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj index 6f8f26b..fc3060a 100644 --- a/linden/indra/llcommon/llcommon_vc8.vcproj +++ b/linden/indra/llcommon/llcommon_vc8.vcproj | |||
| @@ -309,6 +309,10 @@ | |||
| 309 | > | 309 | > |
| 310 | </File> | 310 | </File> |
| 311 | <File | 311 | <File |
| 312 | RelativePath=".\lllog.cpp" | ||
| 313 | > | ||
| 314 | </File> | ||
| 315 | <File | ||
| 312 | RelativePath=".\llmemory.cpp" | 316 | RelativePath=".\llmemory.cpp" |
| 313 | > | 317 | > |
| 314 | </File> | 318 | </File> |
| @@ -599,6 +603,10 @@ | |||
| 599 | > | 603 | > |
| 600 | </File> | 604 | </File> |
| 601 | <File | 605 | <File |
| 606 | RelativePath=".\lllog.h" | ||
| 607 | > | ||
| 608 | </File> | ||
| 609 | <File | ||
| 602 | RelativePath=".\lllslconstants.h" | 610 | RelativePath=".\lllslconstants.h" |
| 603 | > | 611 | > |
| 604 | </File> | 612 | </File> |
diff --git a/linden/indra/llcommon/llcommon_vc9.vcproj b/linden/indra/llcommon/llcommon_vc9.vcproj new file mode 100644 index 0000000..752d13f --- /dev/null +++ b/linden/indra/llcommon/llcommon_vc9.vcproj | |||
| @@ -0,0 +1,808 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="9.00" | ||
| 5 | Name="llcommon" | ||
| 6 | ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}" | ||
| 7 | RootNamespace="llcommon" | ||
| 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="..\..\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;XML_STATIC;APR_DECLARE_STATIC" | ||
| 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)/llcommon.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 | InlineFunctionExpansion="2" | ||
| 115 | EnableIntrinsicFunctions="true" | ||
| 116 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
| 117 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC" | ||
| 118 | RuntimeLibrary="0" | ||
| 119 | StructMemberAlignment="0" | ||
| 120 | TreatWChar_tAsBuiltInType="false" | ||
| 121 | ForceConformanceInForLoopScope="true" | ||
| 122 | UsePrecompiledHeader="0" | ||
| 123 | WarningLevel="3" | ||
| 124 | WarnAsError="true" | ||
| 125 | Detect64BitPortabilityProblems="false" | ||
| 126 | DebugInformationFormat="3" | ||
| 127 | /> | ||
| 128 | <Tool | ||
| 129 | Name="VCManagedResourceCompilerTool" | ||
| 130 | /> | ||
| 131 | <Tool | ||
| 132 | Name="VCResourceCompilerTool" | ||
| 133 | /> | ||
| 134 | <Tool | ||
| 135 | Name="VCPreLinkEventTool" | ||
| 136 | /> | ||
| 137 | <Tool | ||
| 138 | Name="VCLibrarianTool" | ||
| 139 | OutputFile="$(OutDir)/llcommon.lib" | ||
| 140 | /> | ||
| 141 | <Tool | ||
| 142 | Name="VCALinkTool" | ||
| 143 | /> | ||
| 144 | <Tool | ||
| 145 | Name="VCXDCMakeTool" | ||
| 146 | /> | ||
| 147 | <Tool | ||
| 148 | Name="VCBscMakeTool" | ||
| 149 | /> | ||
| 150 | <Tool | ||
| 151 | Name="VCFxCopTool" | ||
| 152 | /> | ||
| 153 | <Tool | ||
| 154 | Name="VCPostBuildEventTool" | ||
| 155 | /> | ||
| 156 | </Configuration> | ||
| 157 | <Configuration | ||
| 158 | Name="ReleaseNoOpt|Win32" | ||
| 159 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
| 160 | IntermediateDirectory="$(ConfigurationName)" | ||
| 161 | ConfigurationType="4" | ||
| 162 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
| 163 | CharacterSet="1" | ||
| 164 | > | ||
| 165 | <Tool | ||
| 166 | Name="VCPreBuildEventTool" | ||
| 167 | /> | ||
| 168 | <Tool | ||
| 169 | Name="VCCustomBuildTool" | ||
| 170 | /> | ||
| 171 | <Tool | ||
| 172 | Name="VCXMLDataGeneratorTool" | ||
| 173 | /> | ||
| 174 | <Tool | ||
| 175 | Name="VCWebServiceProxyGeneratorTool" | ||
| 176 | /> | ||
| 177 | <Tool | ||
| 178 | Name="VCMIDLTool" | ||
| 179 | /> | ||
| 180 | <Tool | ||
| 181 | Name="VCCLCompilerTool" | ||
| 182 | AdditionalOptions="/Oy-" | ||
| 183 | Optimization="0" | ||
| 184 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
| 185 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC" | ||
| 186 | RuntimeLibrary="0" | ||
| 187 | StructMemberAlignment="0" | ||
| 188 | TreatWChar_tAsBuiltInType="false" | ||
| 189 | ForceConformanceInForLoopScope="true" | ||
| 190 | UsePrecompiledHeader="0" | ||
| 191 | WarningLevel="3" | ||
| 192 | WarnAsError="true" | ||
| 193 | Detect64BitPortabilityProblems="false" | ||
| 194 | DebugInformationFormat="3" | ||
| 195 | /> | ||
| 196 | <Tool | ||
| 197 | Name="VCManagedResourceCompilerTool" | ||
| 198 | /> | ||
| 199 | <Tool | ||
| 200 | Name="VCResourceCompilerTool" | ||
| 201 | /> | ||
| 202 | <Tool | ||
| 203 | Name="VCPreLinkEventTool" | ||
| 204 | /> | ||
| 205 | <Tool | ||
| 206 | Name="VCLibrarianTool" | ||
| 207 | AdditionalDependencies="psapi.lib" | ||
| 208 | OutputFile="$(OutDir)/llcommon.lib" | ||
| 209 | AdditionalLibraryDirectories="" | ||
| 210 | /> | ||
| 211 | <Tool | ||
| 212 | Name="VCALinkTool" | ||
| 213 | /> | ||
| 214 | <Tool | ||
| 215 | Name="VCXDCMakeTool" | ||
| 216 | /> | ||
| 217 | <Tool | ||
| 218 | Name="VCBscMakeTool" | ||
| 219 | /> | ||
| 220 | <Tool | ||
| 221 | Name="VCFxCopTool" | ||
| 222 | /> | ||
| 223 | <Tool | ||
| 224 | Name="VCPostBuildEventTool" | ||
| 225 | /> | ||
| 226 | </Configuration> | ||
| 227 | </Configurations> | ||
| 228 | <References> | ||
| 229 | </References> | ||
| 230 | <Files> | ||
| 231 | <Filter | ||
| 232 | Name="Source Files" | ||
| 233 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
| 234 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
| 235 | > | ||
| 236 | <File | ||
| 237 | RelativePath=".\llapp.cpp" | ||
| 238 | > | ||
| 239 | </File> | ||
| 240 | <File | ||
| 241 | RelativePath=".\llapr.cpp" | ||
| 242 | > | ||
| 243 | </File> | ||
| 244 | <File | ||
| 245 | RelativePath=".\llares.cpp" | ||
| 246 | > | ||
| 247 | </File> | ||
| 248 | <File | ||
| 249 | RelativePath=".\llassettype.cpp" | ||
| 250 | > | ||
| 251 | </File> | ||
| 252 | <File | ||
| 253 | RelativePath=".\llbase32.cpp" | ||
| 254 | > | ||
| 255 | </File> | ||
| 256 | <File | ||
| 257 | RelativePath=".\llbase64.cpp" | ||
| 258 | > | ||
| 259 | </File> | ||
| 260 | <File | ||
| 261 | RelativePath=".\llcommon.cpp" | ||
| 262 | > | ||
| 263 | </File> | ||
| 264 | <File | ||
| 265 | RelativePath=".\llcriticaldamp.cpp" | ||
| 266 | > | ||
| 267 | </File> | ||
| 268 | <File | ||
| 269 | RelativePath=".\lldate.cpp" | ||
| 270 | > | ||
| 271 | </File> | ||
| 272 | <File | ||
| 273 | RelativePath=".\llerror.cpp" | ||
| 274 | > | ||
| 275 | </File> | ||
| 276 | <File | ||
| 277 | RelativePath=".\llerrorthread.cpp" | ||
| 278 | > | ||
| 279 | </File> | ||
| 280 | <File | ||
| 281 | RelativePath=".\llevent.cpp" | ||
| 282 | > | ||
| 283 | </File> | ||
| 284 | <File | ||
| 285 | RelativePath=".\llfasttimer.cpp" | ||
| 286 | > | ||
| 287 | </File> | ||
| 288 | <File | ||
| 289 | RelativePath=".\llfile.cpp" | ||
| 290 | > | ||
| 291 | </File> | ||
| 292 | <File | ||
| 293 | RelativePath=".\llfixedbuffer.cpp" | ||
| 294 | > | ||
| 295 | </File> | ||
| 296 | <File | ||
| 297 | RelativePath=".\llformat.cpp" | ||
| 298 | > | ||
| 299 | </File> | ||
| 300 | <File | ||
| 301 | RelativePath=".\llframetimer.cpp" | ||
| 302 | > | ||
| 303 | </File> | ||
| 304 | <File | ||
| 305 | RelativePath=".\llliveappconfig.cpp" | ||
| 306 | > | ||
| 307 | </File> | ||
| 308 | <File | ||
| 309 | RelativePath=".\lllivefile.cpp" | ||
| 310 | > | ||
| 311 | </File> | ||
| 312 | <File | ||
| 313 | RelativePath=".\lllog.cpp" | ||
| 314 | > | ||
| 315 | </File> | ||
| 316 | <File | ||
| 317 | RelativePath=".\llmemory.cpp" | ||
| 318 | > | ||
| 319 | </File> | ||
| 320 | <File | ||
| 321 | RelativePath=".\llmemorystream.cpp" | ||
| 322 | > | ||
| 323 | </File> | ||
| 324 | <File | ||
| 325 | RelativePath=".\llmetrics.cpp" | ||
| 326 | > | ||
| 327 | </File> | ||
| 328 | <File | ||
| 329 | RelativePath=".\llmortician.cpp" | ||
| 330 | > | ||
| 331 | </File> | ||
| 332 | <File | ||
| 333 | RelativePath=".\llprocessor.cpp" | ||
| 334 | > | ||
| 335 | </File> | ||
| 336 | <File | ||
| 337 | RelativePath=".\llqueuedthread.cpp" | ||
| 338 | > | ||
| 339 | </File> | ||
| 340 | <File | ||
| 341 | RelativePath=".\llrun.cpp" | ||
| 342 | > | ||
| 343 | </File> | ||
| 344 | <File | ||
| 345 | RelativePath=".\llsd.cpp" | ||
| 346 | > | ||
| 347 | </File> | ||
| 348 | <File | ||
| 349 | RelativePath=".\llsdserialize.cpp" | ||
| 350 | > | ||
| 351 | </File> | ||
| 352 | <File | ||
| 353 | RelativePath=".\llsdserialize_xml.cpp" | ||
| 354 | > | ||
| 355 | </File> | ||
| 356 | <File | ||
| 357 | RelativePath=".\llsdutil.cpp" | ||
| 358 | > | ||
| 359 | </File> | ||
| 360 | <File | ||
| 361 | RelativePath=".\llsecondlifeurls.cpp" | ||
| 362 | > | ||
| 363 | </File> | ||
| 364 | <File | ||
| 365 | RelativePath=".\llstat.cpp" | ||
| 366 | > | ||
| 367 | </File> | ||
| 368 | <File | ||
| 369 | RelativePath=".\llstreamtools.cpp" | ||
| 370 | > | ||
| 371 | </File> | ||
| 372 | <File | ||
| 373 | RelativePath=".\llstring.cpp" | ||
| 374 | > | ||
| 375 | </File> | ||
| 376 | <File | ||
| 377 | RelativePath=".\llstringtable.cpp" | ||
| 378 | > | ||
| 379 | </File> | ||
| 380 | <File | ||
| 381 | RelativePath=".\llsys.cpp" | ||
| 382 | > | ||
| 383 | </File> | ||
| 384 | <File | ||
| 385 | RelativePath=".\llthread.cpp" | ||
| 386 | > | ||
| 387 | </File> | ||
| 388 | <File | ||
| 389 | RelativePath=".\lltimer.cpp" | ||
| 390 | > | ||
| 391 | </File> | ||
| 392 | <File | ||
| 393 | RelativePath=".\lluri.cpp" | ||
| 394 | > | ||
| 395 | </File> | ||
| 396 | <File | ||
| 397 | RelativePath=".\llworkerthread.cpp" | ||
| 398 | > | ||
| 399 | </File> | ||
| 400 | <File | ||
| 401 | RelativePath=".\metaclass.cpp" | ||
| 402 | > | ||
| 403 | </File> | ||
| 404 | <File | ||
| 405 | RelativePath=".\metaproperty.cpp" | ||
| 406 | > | ||
| 407 | </File> | ||
| 408 | <File | ||
| 409 | RelativePath=".\reflective.cpp" | ||
| 410 | > | ||
| 411 | </File> | ||
| 412 | <File | ||
| 413 | RelativePath=".\timing.cpp" | ||
| 414 | > | ||
| 415 | </File> | ||
| 416 | <File | ||
| 417 | RelativePath=".\u64.cpp" | ||
| 418 | > | ||
| 419 | </File> | ||
| 420 | </Filter> | ||
| 421 | <Filter | ||
| 422 | Name="Header Files" | ||
| 423 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
| 424 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
| 425 | > | ||
| 426 | <File | ||
| 427 | RelativePath=".\bitpack.h" | ||
| 428 | > | ||
| 429 | </File> | ||
| 430 | <File | ||
| 431 | RelativePath=".\doublelinkedlist.h" | ||
| 432 | > | ||
| 433 | </File> | ||
| 434 | <File | ||
| 435 | RelativePath=".\imageids.h" | ||
| 436 | > | ||
| 437 | </File> | ||
| 438 | <File | ||
| 439 | RelativePath=".\indra_constants.h" | ||
| 440 | > | ||
| 441 | </File> | ||
| 442 | <File | ||
| 443 | RelativePath=".\linden_common.h" | ||
| 444 | > | ||
| 445 | </File> | ||
| 446 | <File | ||
| 447 | RelativePath=".\linked_lists.h" | ||
| 448 | > | ||
| 449 | </File> | ||
| 450 | <File | ||
| 451 | RelativePath=".\llagentconstants.h" | ||
| 452 | > | ||
| 453 | </File> | ||
| 454 | <File | ||
| 455 | RelativePath=".\llapp.h" | ||
| 456 | > | ||
| 457 | </File> | ||
| 458 | <File | ||
| 459 | RelativePath=".\llapr.h" | ||
| 460 | > | ||
| 461 | </File> | ||
| 462 | <File | ||
| 463 | RelativePath=".\llares.h" | ||
| 464 | > | ||
| 465 | </File> | ||
| 466 | <File | ||
| 467 | RelativePath=".\llassettype.h" | ||
| 468 | > | ||
| 469 | </File> | ||
| 470 | <File | ||
| 471 | RelativePath=".\llassoclist.h" | ||
| 472 | > | ||
| 473 | </File> | ||
| 474 | <File | ||
| 475 | RelativePath=".\llavatarconstants.h" | ||
| 476 | > | ||
| 477 | </File> | ||
| 478 | <File | ||
| 479 | RelativePath=".\llbase32.h" | ||
| 480 | > | ||
| 481 | </File> | ||
| 482 | <File | ||
| 483 | RelativePath=".\llbase64.h" | ||
| 484 | > | ||
| 485 | </File> | ||
| 486 | <File | ||
| 487 | RelativePath=".\llboost.h" | ||
| 488 | > | ||
| 489 | </File> | ||
| 490 | <File | ||
| 491 | RelativePath=".\llchat.h" | ||
| 492 | > | ||
| 493 | </File> | ||
| 494 | <File | ||
| 495 | RelativePath=".\llclickaction.h" | ||
| 496 | > | ||
| 497 | </File> | ||
| 498 | <File | ||
| 499 | RelativePath=".\llcommon.h" | ||
| 500 | > | ||
| 501 | </File> | ||
| 502 | <File | ||
| 503 | RelativePath=".\llcriticaldamp.h" | ||
| 504 | > | ||
| 505 | </File> | ||
| 506 | <File | ||
| 507 | RelativePath=".\lldarray.h" | ||
| 508 | > | ||
| 509 | </File> | ||
| 510 | <File | ||
| 511 | RelativePath=".\lldarrayptr.h" | ||
| 512 | > | ||
| 513 | </File> | ||
| 514 | <File | ||
| 515 | RelativePath=".\lldate.h" | ||
| 516 | > | ||
| 517 | </File> | ||
| 518 | <File | ||
| 519 | RelativePath=".\lldefs.h" | ||
| 520 | > | ||
| 521 | </File> | ||
| 522 | <File | ||
| 523 | RelativePath=".\lldlinked.h" | ||
| 524 | > | ||
| 525 | </File> | ||
| 526 | <File | ||
| 527 | RelativePath=".\lldqueueptr.h" | ||
| 528 | > | ||
| 529 | </File> | ||
| 530 | <File | ||
| 531 | RelativePath=".\llendianswizzle.h" | ||
| 532 | > | ||
| 533 | </File> | ||
| 534 | <File | ||
| 535 | RelativePath=".\llenum.h" | ||
| 536 | > | ||
| 537 | </File> | ||
| 538 | <File | ||
| 539 | RelativePath=".\llerror.h" | ||
| 540 | > | ||
| 541 | </File> | ||
| 542 | <File | ||
| 543 | RelativePath=".\llerrorcontrol.h" | ||
| 544 | > | ||
| 545 | </File> | ||
| 546 | <File | ||
| 547 | RelativePath=".\llerrorthread.h" | ||
| 548 | > | ||
| 549 | </File> | ||
| 550 | <File | ||
| 551 | RelativePath=".\llevent.h" | ||
| 552 | > | ||
| 553 | </File> | ||
| 554 | <File | ||
| 555 | RelativePath=".\llextendedstatus.h" | ||
| 556 | > | ||
| 557 | </File> | ||
| 558 | <File | ||
| 559 | RelativePath=".\llfasttimer.h" | ||
| 560 | > | ||
| 561 | </File> | ||
| 562 | <File | ||
| 563 | RelativePath=".\llfile.h" | ||
| 564 | > | ||
| 565 | </File> | ||
| 566 | <File | ||
| 567 | RelativePath=".\llfixedbuffer.h" | ||
| 568 | > | ||
| 569 | </File> | ||
| 570 | <File | ||
| 571 | RelativePath=".\llformat.h" | ||
| 572 | > | ||
| 573 | </File> | ||
| 574 | <File | ||
| 575 | RelativePath=".\llframecallbackmanager.h" | ||
| 576 | > | ||
| 577 | </File> | ||
| 578 | <File | ||
| 579 | RelativePath=".\llframetimer.h" | ||
| 580 | > | ||
| 581 | </File> | ||
| 582 | <File | ||
| 583 | RelativePath=".\llhash.h" | ||
| 584 | > | ||
| 585 | </File> | ||
| 586 | <File | ||
| 587 | RelativePath=".\llindexedqueue.h" | ||
| 588 | > | ||
| 589 | </File> | ||
| 590 | <File | ||
| 591 | RelativePath=".\lllinkedqueue.h" | ||
| 592 | > | ||
| 593 | </File> | ||
| 594 | <File | ||
| 595 | RelativePath=".\llliveappconfig.h" | ||
| 596 | > | ||
| 597 | </File> | ||
| 598 | <File | ||
| 599 | RelativePath=".\lllivefile.h" | ||
| 600 | > | ||
| 601 | </File> | ||
| 602 | <File | ||
| 603 | RelativePath=".\lllocalidhashmap.h" | ||
| 604 | > | ||
| 605 | </File> | ||
| 606 | <File | ||
| 607 | RelativePath=".\lllog.h" | ||
| 608 | > | ||
| 609 | </File> | ||
| 610 | <File | ||
| 611 | RelativePath=".\lllslconstants.h" | ||
| 612 | > | ||
| 613 | </File> | ||
| 614 | <File | ||
| 615 | RelativePath=".\llmap.h" | ||
| 616 | > | ||
| 617 | </File> | ||
| 618 | <File | ||
| 619 | RelativePath=".\llmemory.h" | ||
| 620 | > | ||
| 621 | </File> | ||
| 622 | <File | ||
| 623 | RelativePath=".\llmemorystream.h" | ||
| 624 | > | ||
| 625 | </File> | ||
| 626 | <File | ||
| 627 | RelativePath=".\llmemtype.h" | ||
| 628 | > | ||
| 629 | </File> | ||
| 630 | <File | ||
| 631 | RelativePath=".\llmetrics.h" | ||
| 632 | > | ||
| 633 | </File> | ||
| 634 | <File | ||
| 635 | RelativePath=".\llmortician.h" | ||
| 636 | > | ||
| 637 | </File> | ||
| 638 | <File | ||
| 639 | RelativePath=".\llnametable.h" | ||
| 640 | > | ||
| 641 | </File> | ||
| 642 | <File | ||
| 643 | RelativePath=".\llpreprocessor.h" | ||
| 644 | > | ||
| 645 | </File> | ||
| 646 | <File | ||
| 647 | RelativePath=".\llpriqueuemap.h" | ||
| 648 | > | ||
| 649 | </File> | ||
| 650 | <File | ||
| 651 | RelativePath=".\llprocessor.h" | ||
| 652 | > | ||
| 653 | </File> | ||
| 654 | <File | ||
| 655 | RelativePath=".\llptrskiplist.h" | ||
| 656 | > | ||
| 657 | </File> | ||
| 658 | <File | ||
| 659 | RelativePath=".\llptrskipmap.h" | ||
| 660 | > | ||
| 661 | </File> | ||
| 662 | <File | ||
| 663 | RelativePath=".\llqueuedthread.h" | ||
| 664 | > | ||
| 665 | </File> | ||
| 666 | <File | ||
| 667 | RelativePath=".\llrun.h" | ||
| 668 | > | ||
| 669 | </File> | ||
| 670 | <File | ||
| 671 | RelativePath=".\llsd.h" | ||
| 672 | > | ||
| 673 | </File> | ||
| 674 | <File | ||
| 675 | RelativePath=".\llsdserialize.h" | ||
| 676 | > | ||
| 677 | </File> | ||
| 678 | <File | ||
| 679 | RelativePath=".\llsdserialize_xml.h" | ||
| 680 | > | ||
| 681 | </File> | ||
| 682 | <File | ||
| 683 | RelativePath=".\llsdutil.h" | ||
| 684 | > | ||
| 685 | </File> | ||
| 686 | <File | ||
| 687 | RelativePath=".\llsecondlifeurls.h" | ||
| 688 | > | ||
| 689 | </File> | ||
| 690 | <File | ||
| 691 | RelativePath=".\llskiplist.h" | ||
| 692 | > | ||
| 693 | </File> | ||
| 694 | <File | ||
| 695 | RelativePath=".\llskipmap.h" | ||
| 696 | > | ||
| 697 | </File> | ||
| 698 | <File | ||
| 699 | RelativePath=".\llstat.h" | ||
| 700 | > | ||
| 701 | </File> | ||
| 702 | <File | ||
| 703 | RelativePath=".\llstatenums.h" | ||
| 704 | > | ||
| 705 | </File> | ||
| 706 | <File | ||
| 707 | RelativePath=".\llstl.h" | ||
| 708 | > | ||
| 709 | </File> | ||
| 710 | <File | ||
| 711 | RelativePath=".\llstreamtools.h" | ||
| 712 | > | ||
| 713 | </File> | ||
| 714 | <File | ||
| 715 | RelativePath=".\llstrider.h" | ||
| 716 | > | ||
| 717 | </File> | ||
| 718 | <File | ||
| 719 | RelativePath=".\llstring.h" | ||
| 720 | > | ||
| 721 | </File> | ||
| 722 | <File | ||
| 723 | RelativePath=".\llstringtable.h" | ||
| 724 | > | ||
| 725 | </File> | ||
| 726 | <File | ||
| 727 | RelativePath=".\llsys.h" | ||
| 728 | > | ||
| 729 | </File> | ||
| 730 | <File | ||
| 731 | RelativePath=".\llthread.h" | ||
| 732 | > | ||
| 733 | </File> | ||
| 734 | <File | ||
| 735 | RelativePath=".\lltimer.h" | ||
| 736 | > | ||
| 737 | </File> | ||
| 738 | <File | ||
| 739 | RelativePath=".\lluri.h" | ||
| 740 | > | ||
| 741 | </File> | ||
| 742 | <File | ||
| 743 | RelativePath=".\lluuidhashmap.h" | ||
| 744 | > | ||
| 745 | </File> | ||
| 746 | <File | ||
| 747 | RelativePath=".\llversionserver.h" | ||
| 748 | > | ||
| 749 | </File> | ||
| 750 | <File | ||
| 751 | RelativePath=".\llversionviewer.h" | ||
| 752 | > | ||
| 753 | </File> | ||
| 754 | <File | ||
| 755 | RelativePath=".\llworkerthread.h" | ||
| 756 | > | ||
| 757 | </File> | ||
| 758 | <File | ||
| 759 | RelativePath=".\new_mem_ops.h" | ||
| 760 | > | ||
| 761 | </File> | ||
| 762 | <File | ||
| 763 | RelativePath=".\priqueue.h" | ||
| 764 | > | ||
| 765 | </File> | ||
| 766 | <File | ||
| 767 | RelativePath=".\processor.h" | ||
| 768 | > | ||
| 769 | </File> | ||
| 770 | <File | ||
| 771 | RelativePath=".\roles_constants.h" | ||
| 772 | > | ||
| 773 | </File> | ||
| 774 | <File | ||
| 775 | RelativePath=".\stdenums.h" | ||
| 776 | > | ||
| 777 | </File> | ||
| 778 | <File | ||
| 779 | RelativePath=".\stdtypes.h" | ||
| 780 | > | ||
| 781 | </File> | ||
| 782 | <File | ||
| 783 | RelativePath=".\string_table.h" | ||
| 784 | > | ||
| 785 | </File> | ||
| 786 | <File | ||
| 787 | RelativePath=".\timer.h" | ||
| 788 | > | ||
| 789 | </File> | ||
| 790 | <File | ||
| 791 | RelativePath=".\timing.h" | ||
| 792 | > | ||
| 793 | </File> | ||
| 794 | <File | ||
| 795 | RelativePath=".\u64.h" | ||
| 796 | > | ||
| 797 | </File> | ||
| 798 | </Filter> | ||
| 799 | <Filter | ||
| 800 | Name="Resource Files" | ||
| 801 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
| 802 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
| 803 | > | ||
| 804 | </Filter> | ||
| 805 | </Files> | ||
| 806 | <Globals> | ||
| 807 | </Globals> | ||
| 808 | </VisualStudioProject> | ||
diff --git a/linden/indra/llcommon/llcriticaldamp.cpp b/linden/indra/llcommon/llcriticaldamp.cpp index 456f591..2acd133 100644 --- a/linden/indra/llcommon/llcriticaldamp.cpp +++ b/linden/indra/llcommon/llcriticaldamp.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/llcommon/llcriticaldamp.h b/linden/indra/llcommon/llcriticaldamp.h index e6f31cf..7d9256c 100644 --- a/linden/indra/llcommon/llcriticaldamp.h +++ b/linden/indra/llcommon/llcriticaldamp.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/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h index 0068b57..9bffd63 100644 --- a/linden/indra/llcommon/lldarray.h +++ b/linden/indra/llcommon/lldarray.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/llcommon/lldarrayptr.h b/linden/indra/llcommon/lldarrayptr.h index 8fab4b9..108b7f6 100644 --- a/linden/indra/llcommon/lldarrayptr.h +++ b/linden/indra/llcommon/lldarrayptr.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/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp index 6783a80..5d36d2b 100644 --- a/linden/indra/llcommon/lldate.cpp +++ b/linden/indra/llcommon/lldate.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h index e144052..8a929d9 100644 --- a/linden/indra/llcommon/lldate.h +++ b/linden/indra/llcommon/lldate.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h index 69bfaa7..d081245 100644 --- a/linden/indra/llcommon/lldefs.h +++ b/linden/indra/llcommon/lldefs.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, |
| @@ -183,7 +183,15 @@ template <class LLDATATYPE> | |||
| 183 | inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3) | 183 | inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3) |
| 184 | { | 184 | { |
| 185 | LLDATATYPE r = llmax(d1,d2); | 185 | LLDATATYPE r = llmax(d1,d2); |
| 186 | return (r > d3 ? r : d3); | 186 | return llmax(r, d3); |
| 187 | } | ||
| 188 | |||
| 189 | template <class LLDATATYPE> | ||
| 190 | inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4) | ||
| 191 | { | ||
| 192 | LLDATATYPE r1 = llmax(d1,d2); | ||
| 193 | LLDATATYPE r2 = llmax(d3,d4); | ||
| 194 | return llmax(r1, r2); | ||
| 187 | } | 195 | } |
| 188 | 196 | ||
| 189 | template <class LLDATATYPE> | 197 | template <class LLDATATYPE> |
| @@ -200,6 +208,14 @@ inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATA | |||
| 200 | } | 208 | } |
| 201 | 209 | ||
| 202 | template <class LLDATATYPE> | 210 | template <class LLDATATYPE> |
| 211 | inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4) | ||
| 212 | { | ||
| 213 | LLDATATYPE r1 = llmin(d1,d2); | ||
| 214 | LLDATATYPE r2 = llmin(d3,d4); | ||
| 215 | return llmin(r1, r2); | ||
| 216 | } | ||
| 217 | |||
| 218 | template <class LLDATATYPE> | ||
| 203 | inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval) | 219 | inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval) |
| 204 | { | 220 | { |
| 205 | return llmin(llmax(a, minval), maxval); | 221 | return llmin(llmax(a, minval), maxval); |
diff --git a/linden/indra/llcommon/lldepthstack.h b/linden/indra/llcommon/lldepthstack.h index 2be52f8..65492d2 100644 --- a/linden/indra/llcommon/lldepthstack.h +++ b/linden/indra/llcommon/lldepthstack.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/llcommon/lldlinked.h b/linden/indra/llcommon/lldlinked.h index 108b245..7278ee4 100644 --- a/linden/indra/llcommon/lldlinked.h +++ b/linden/indra/llcommon/lldlinked.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/llcommon/lldqueueptr.h b/linden/indra/llcommon/lldqueueptr.h index df543e8..248357e 100644 --- a/linden/indra/llcommon/lldqueueptr.h +++ b/linden/indra/llcommon/lldqueueptr.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/llcommon/llendianswizzle.h b/linden/indra/llcommon/llendianswizzle.h index 0df4d65..0b101f9 100644 --- a/linden/indra/llcommon/llendianswizzle.h +++ b/linden/indra/llcommon/llendianswizzle.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/llcommon/llenum.h b/linden/indra/llcommon/llenum.h index b73dfd3..1ec305f 100644 --- a/linden/indra/llcommon/llenum.h +++ b/linden/indra/llcommon/llenum.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/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp index 68383ce..d9ab57c 100644 --- a/linden/indra/llcommon/llerror.cpp +++ b/linden/indra/llcommon/llerror.cpp | |||
| @@ -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/llcommon/llerror.h b/linden/indra/llcommon/llerror.h index 16f6ad6..e1ace39 100644 --- a/linden/indra/llcommon/llerror.h +++ b/linden/indra/llcommon/llerror.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/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h index 5cd7547..2c36871 100644 --- a/linden/indra/llcommon/llerrorcontrol.h +++ b/linden/indra/llcommon/llerrorcontrol.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/llcommon/llerrorlegacy.h b/linden/indra/llcommon/llerrorlegacy.h index e6388b0..e88b09c 100644 --- a/linden/indra/llcommon/llerrorlegacy.h +++ b/linden/indra/llcommon/llerrorlegacy.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/llcommon/llerrorthread.cpp b/linden/indra/llcommon/llerrorthread.cpp index 9622628..d6fed78 100644 --- a/linden/indra/llcommon/llerrorthread.cpp +++ b/linden/indra/llcommon/llerrorthread.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/llcommon/llerrorthread.h b/linden/indra/llcommon/llerrorthread.h index 09bb8a8..f0865e1 100644 --- a/linden/indra/llcommon/llerrorthread.h +++ b/linden/indra/llcommon/llerrorthread.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/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp index 78fb4d7..33af028 100644 --- a/linden/indra/llcommon/llevent.cpp +++ b/linden/indra/llcommon/llevent.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/llcommon/llevent.h b/linden/indra/llcommon/llevent.h index 5a24d09..83cb79f 100644 --- a/linden/indra/llcommon/llevent.h +++ b/linden/indra/llcommon/llevent.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, |
| @@ -179,7 +179,7 @@ public: | |||
| 179 | if (mDispatcher.notNull()) mDispatcher->removeListener(listener); | 179 | if (mDispatcher.notNull()) mDispatcher->removeListener(listener); |
| 180 | } | 180 | } |
| 181 | // Notifies the dispatcher of an event being fired. | 181 | // Notifies the dispatcher of an event being fired. |
| 182 | void fireEvent(LLPointer<LLEvent> event, LLSD filter); | 182 | void fireEvent(LLPointer<LLEvent> event, LLSD filter = LLSD()); |
| 183 | 183 | ||
| 184 | protected: | 184 | protected: |
| 185 | LLPointer<LLEventDispatcher> mDispatcher; | 185 | LLPointer<LLEventDispatcher> mDispatcher; |
diff --git a/linden/indra/llcommon/lleventemitter.h b/linden/indra/llcommon/lleventemitter.h index 0d7c84b..cdd3932 100644 --- a/linden/indra/llcommon/lleventemitter.h +++ b/linden/indra/llcommon/lleventemitter.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/llcommon/llextendedstatus.h b/linden/indra/llcommon/llextendedstatus.h index 93259da..5bd9856 100644 --- a/linden/indra/llcommon/llextendedstatus.h +++ b/linden/indra/llcommon/llextendedstatus.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/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp index 19e42e2..01db945 100644 --- a/linden/indra/llcommon/llfasttimer.cpp +++ b/linden/indra/llcommon/llfasttimer.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/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h index 62383fa..b953960 100644 --- a/linden/indra/llcommon/llfasttimer.h +++ b/linden/indra/llcommon/llfasttimer.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/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp index fb73b9b..38157df 100644 --- a/linden/indra/llcommon/llfile.cpp +++ b/linden/indra/llcommon/llfile.cpp | |||
| @@ -15,12 +15,12 @@ | |||
| 15 | * ("GPL"), unless you have obtained a separate licensing agreement | 15 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 16 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 16 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 17 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 17 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 18 | * online at http://secondlife.com/developers/opensource/gplv2 | 18 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 19 | * | 19 | * |
| 20 | * There are special exceptions to the terms and conditions of the GPL as | 20 | * There are special exceptions to the terms and conditions of the GPL as |
| 21 | * it is applied to this Source Code. View the full text of the exception | 21 | * it is applied to this Source Code. View the full text of the exception |
| 22 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 22 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 23 | * online at http://secondlife.com/developers/opensource/flossexception | 23 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 24 | * | 24 | * |
| 25 | * By copying, modifying or distributing this software, you acknowledge | 25 | * By copying, modifying or distributing this software, you acknowledge |
| 26 | * that you have read and understood your obligations described above, | 26 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h index 6e90168..062b183 100644 --- a/linden/indra/llcommon/llfile.h +++ b/linden/indra/llcommon/llfile.h | |||
| @@ -15,12 +15,12 @@ | |||
| 15 | * ("GPL"), unless you have obtained a separate licensing agreement | 15 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 16 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 16 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 17 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 17 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 18 | * online at http://secondlife.com/developers/opensource/gplv2 | 18 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 19 | * | 19 | * |
| 20 | * There are special exceptions to the terms and conditions of the GPL as | 20 | * There are special exceptions to the terms and conditions of the GPL as |
| 21 | * it is applied to this Source Code. View the full text of the exception | 21 | * it is applied to this Source Code. View the full text of the exception |
| 22 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 22 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 23 | * online at http://secondlife.com/developers/opensource/flossexception | 23 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 24 | * | 24 | * |
| 25 | * By copying, modifying or distributing this software, you acknowledge | 25 | * By copying, modifying or distributing this software, you acknowledge |
| 26 | * that you have read and understood your obligations described above, | 26 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp index 448846b..776de0d 100644 --- a/linden/indra/llcommon/llfixedbuffer.cpp +++ b/linden/indra/llcommon/llfixedbuffer.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/llcommon/llfixedbuffer.h b/linden/indra/llcommon/llfixedbuffer.h index c044ed8..06a7f45 100644 --- a/linden/indra/llcommon/llfixedbuffer.h +++ b/linden/indra/llcommon/llfixedbuffer.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/llcommon/llformat.cpp b/linden/indra/llcommon/llformat.cpp index 8e5a549..8a8c699 100644 --- a/linden/indra/llcommon/llformat.cpp +++ b/linden/indra/llcommon/llformat.cpp | |||
| @@ -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/llcommon/llformat.h b/linden/indra/llcommon/llformat.h index a3e4f6a..52eca0b 100644 --- a/linden/indra/llcommon/llformat.h +++ b/linden/indra/llcommon/llformat.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/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp index af46f96..9de3be2 100644 --- a/linden/indra/llcommon/llframetimer.cpp +++ b/linden/indra/llcommon/llframetimer.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/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h index 915f1d4..bc0d79d 100644 --- a/linden/indra/llcommon/llframetimer.h +++ b/linden/indra/llcommon/llframetimer.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/llcommon/llhash.h b/linden/indra/llcommon/llhash.h index a86a2d5..716d9df 100644 --- a/linden/indra/llcommon/llhash.h +++ b/linden/indra/llcommon/llhash.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/llcommon/llindexedqueue.h b/linden/indra/llcommon/llindexedqueue.h index 35d30e4..d15417b 100644 --- a/linden/indra/llcommon/llindexedqueue.h +++ b/linden/indra/llcommon/llindexedqueue.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/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h index 26009bb..c2dc9d2 100644 --- a/linden/indra/llcommon/llkeythrottle.h +++ b/linden/indra/llcommon/llkeythrottle.h | |||
| @@ -1,17 +1,26 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * @file llkeythrottle.h | 2 | * @file llkeythrottle.h |
| 3 | * @brief LLKeyThrottle class definition | ||
| 4 | * | 3 | * |
| 5 | * $LicenseInfo:firstyear=2005&license=internal$ | 4 | * $LicenseInfo:firstyear=2005&license=viewergpl$ |
| 6 | * | 5 | * |
| 7 | * Copyright (c) 2005-2008, Linden Research, Inc. | 6 | * Copyright (c) 2005-2008, Linden Research, Inc. |
| 8 | * | 7 | * |
| 9 | * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of | 8 | * Second Life Viewer Source Code |
| 10 | * this source code is governed by the Linden Lab Source Code Disclosure | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 11 | * Agreement ("Agreement") previously entered between you and Linden | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 12 | * Lab. By accessing, using, copying, modifying or distributing this | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 13 | * software, you acknowledge that you have been informed of your | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 14 | * obligations under the Agreement and agree to abide by those obligations. | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | ||
| 15 | * | ||
| 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 | ||
| 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | ||
| 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
| 20 | * | ||
| 21 | * By copying, modifying or distributing this software, you acknowledge | ||
| 22 | * that you have read and understood your obligations described above, | ||
| 23 | * and agree to abide by those obligations. | ||
| 15 | * | 24 | * |
| 16 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 25 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
| 17 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 26 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
| @@ -34,11 +43,16 @@ | |||
| 34 | #include <map> | 43 | #include <map> |
| 35 | 44 | ||
| 36 | 45 | ||
| 46 | // forward declaration so LLKeyThrottleImpl can befriend it | ||
| 47 | template <class T> class LLKeyThrottle; | ||
| 48 | |||
| 49 | |||
| 37 | // Implementation utility class - use LLKeyThrottle, not this | 50 | // Implementation utility class - use LLKeyThrottle, not this |
| 38 | template <class T> | 51 | template <class T> |
| 39 | class LLKeyThrottleImpl | 52 | class LLKeyThrottleImpl |
| 40 | { | 53 | { |
| 41 | public: | 54 | friend class LLKeyThrottle<T>; |
| 55 | protected: | ||
| 42 | struct Entry { | 56 | struct Entry { |
| 43 | U32 count; | 57 | U32 count; |
| 44 | BOOL blocked; | 58 | BOOL blocked; |
| @@ -60,7 +74,9 @@ public: | |||
| 60 | // currMap started counting at this time | 74 | // currMap started counting at this time |
| 61 | // prevMap covers the previous interval | 75 | // prevMap covers the previous interval |
| 62 | 76 | ||
| 63 | LLKeyThrottleImpl() : prevMap(0), currMap(0) { } | 77 | LLKeyThrottleImpl() : prevMap(0), currMap(0), |
| 78 | countLimit(0), interval_usec(0), | ||
| 79 | start_usec(0) { }; | ||
| 64 | 80 | ||
| 65 | static U64 getTime() | 81 | static U64 getTime() |
| 66 | { | 82 | { |
diff --git a/linden/indra/llcommon/lllinkedqueue.h b/linden/indra/llcommon/lllinkedqueue.h index 7e2a5ab..aa64ac6 100644 --- a/linden/indra/llcommon/lllinkedqueue.h +++ b/linden/indra/llcommon/lllinkedqueue.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/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp index 8967e9e..ad11987 100644 --- a/linden/indra/llcommon/llliveappconfig.cpp +++ b/linden/indra/llcommon/llliveappconfig.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/llcommon/llliveappconfig.h b/linden/indra/llcommon/llliveappconfig.h index 2a29c04..fc845db 100644 --- a/linden/indra/llcommon/llliveappconfig.h +++ b/linden/indra/llcommon/llliveappconfig.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/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp index 3e45684..6e027ef 100644 --- a/linden/indra/llcommon/lllivefile.cpp +++ b/linden/indra/llcommon/lllivefile.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/llcommon/lllivefile.h b/linden/indra/llcommon/lllivefile.h index ef37095..1d55f7b 100644 --- a/linden/indra/llcommon/lllivefile.h +++ b/linden/indra/llcommon/lllivefile.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/llcommon/lllocalidhashmap.h b/linden/indra/llcommon/lllocalidhashmap.h index 091e217..ced83a1 100644 --- a/linden/indra/llcommon/lllocalidhashmap.h +++ b/linden/indra/llcommon/lllocalidhashmap.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/llcommon/lllog.cpp b/linden/indra/llcommon/lllog.cpp new file mode 100644 index 0000000..147b2d3 --- /dev/null +++ b/linden/indra/llcommon/lllog.cpp | |||
| @@ -0,0 +1,115 @@ | |||
| 1 | /** | ||
| 2 | * @file lllog.cpp | ||
| 3 | * @author Don | ||
| 4 | * @date 2007-11-27 | ||
| 5 | * @brief Class to log messages to syslog for streambase to process. | ||
| 6 | * | ||
| 7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | ||
| 8 | * | ||
| 9 | * Copyright (c) 2007-2008, Linden Research, Inc. | ||
| 10 | * | ||
| 11 | * Second Life Viewer Source Code | ||
| 12 | * The source code in this file ("Source Code") is provided by Linden Lab | ||
| 13 | * to you under the terms of the GNU General Public License, version 2.0 | ||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | ||
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | ||
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | ||
| 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | ||
| 18 | * | ||
| 19 | * There are special exceptions to the terms and conditions of the GPL as | ||
| 20 | * it is applied to this Source Code. View the full text of the exception | ||
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | ||
| 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
| 23 | * | ||
| 24 | * By copying, modifying or distributing this software, you acknowledge | ||
| 25 | * that you have read and understood your obligations described above, | ||
| 26 | * and agree to abide by those obligations. | ||
| 27 | * | ||
| 28 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | ||
| 29 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | ||
| 30 | * COMPLETENESS OR PERFORMANCE. | ||
| 31 | * $/LicenseInfo$ | ||
| 32 | */ | ||
| 33 | |||
| 34 | #include "linden_common.h" | ||
| 35 | #include "lllog.h" | ||
| 36 | |||
| 37 | #include "llapp.h" | ||
| 38 | #include "llsd.h" | ||
| 39 | #include "llsdserialize.h" | ||
| 40 | |||
| 41 | |||
| 42 | class LLLogImpl | ||
| 43 | { | ||
| 44 | public: | ||
| 45 | LLLogImpl(LLApp* app) : mApp(app) {} | ||
| 46 | ~LLLogImpl() {} | ||
| 47 | |||
| 48 | void log(const std::string message, LLSD& info); | ||
| 49 | bool useLegacyLogMessage(const std::string message); | ||
| 50 | |||
| 51 | private: | ||
| 52 | LLApp* mApp; | ||
| 53 | }; | ||
| 54 | |||
| 55 | |||
| 56 | //@brief Function to log a message to syslog for streambase to collect. | ||
| 57 | void LLLogImpl::log(const std::string message, LLSD& info) | ||
| 58 | { | ||
| 59 | static S32 sequence = 0; | ||
| 60 | LLSD log_config = mApp->getOption("log-messages"); | ||
| 61 | if (log_config.has(message)) | ||
| 62 | { | ||
| 63 | LLSD message_config = log_config[message]; | ||
| 64 | if (message_config.has("use-syslog")) | ||
| 65 | { | ||
| 66 | if (! message_config["use-syslog"].asBoolean()) | ||
| 67 | { | ||
| 68 | return; | ||
| 69 | } | ||
| 70 | } | ||
| 71 | } | ||
| 72 | llinfos << "LLLOGMESSAGE (" << (sequence++) << ") " << message << " " << LLSDNotationStreamer(info) << llendl; | ||
| 73 | } | ||
| 74 | |||
| 75 | //@brief Function to check if specified legacy log message should be sent. | ||
| 76 | bool LLLogImpl::useLegacyLogMessage(const std::string message) | ||
| 77 | { | ||
| 78 | LLSD log_config = mApp->getOption("log-messages"); | ||
| 79 | if (log_config.has(message)) | ||
| 80 | { | ||
| 81 | LLSD message_config = log_config[message]; | ||
| 82 | if (message_config.has("use-legacy")) | ||
| 83 | { | ||
| 84 | return message_config["use-legacy"].asBoolean(); | ||
| 85 | } | ||
| 86 | } | ||
| 87 | return true; | ||
| 88 | } | ||
| 89 | |||
| 90 | |||
| 91 | LLLog::LLLog(LLApp* app) | ||
| 92 | { | ||
| 93 | mImpl = new LLLogImpl(app); | ||
| 94 | } | ||
| 95 | |||
| 96 | LLLog::~LLLog() | ||
| 97 | { | ||
| 98 | delete mImpl; | ||
| 99 | mImpl = NULL; | ||
| 100 | } | ||
| 101 | |||
| 102 | void LLLog::log(const std::string message, LLSD& info) | ||
| 103 | { | ||
| 104 | if (mImpl) mImpl->log(message, info); | ||
| 105 | } | ||
| 106 | |||
| 107 | bool LLLog::useLegacyLogMessage(const std::string message) | ||
| 108 | { | ||
| 109 | if (mImpl) | ||
| 110 | { | ||
| 111 | return mImpl->useLegacyLogMessage(message); | ||
| 112 | } | ||
| 113 | return true; | ||
| 114 | } | ||
| 115 | |||
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/llcommon/lllog.h index 06167c2..a852a39 100644 --- a/linden/indra/newview/llfloaterhtmlhelp.h +++ b/linden/indra/llcommon/lllog.h | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * @file llfloaterhtmlhelp.h | 2 | * @file lllog.h |
| 3 | * @brief HTML Help floater - uses embedded web browser control | 3 | * @author Don |
| 4 | * @date 2007-11-27 | ||
| 5 | * @brief Class to log messages to syslog for streambase to process. | ||
| 4 | * | 6 | * |
| 5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | 7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
| 6 | * | 8 | * |
| 7 | * Copyright (c) 2006-2008, Linden Research, Inc. | 9 | * Copyright (c) 2007-2008, Linden Research, Inc. |
| 8 | * | 10 | * |
| 9 | * Second Life Viewer Source Code | 11 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 12 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -12,12 +14,12 @@ | |||
| 12 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("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 | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 15 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 16 | * | 18 | * |
| 17 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * 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 | 20 | * 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 | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 20 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 21 | * | 23 | * |
| 22 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 23 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
| @@ -29,25 +31,27 @@ | |||
| 29 | * $/LicenseInfo$ | 31 | * $/LicenseInfo$ |
| 30 | */ | 32 | */ |
| 31 | 33 | ||
| 32 | #if LL_LIBXUL_ENABLED | 34 | #ifndef LL_LLLOG_H |
| 35 | #define LL_LLLOG_H | ||
| 33 | 36 | ||
| 34 | #ifndef LL_LLFLOATERHTMLHELP_H | 37 | #include <string> |
| 35 | #define LL_LLFLOATERHTMLHELP_H | ||
| 36 | 38 | ||
| 37 | #include "llhtmlhelp.h" | 39 | class LLLogImpl; |
| 40 | class LLApp; | ||
| 41 | class LLSD; | ||
| 38 | 42 | ||
| 39 | class LLViewerHtmlHelp : public LLHtmlHelp | 43 | class LLLog |
| 40 | { | 44 | { |
| 41 | public: | 45 | public: |
| 42 | LLViewerHtmlHelp(); | 46 | LLLog(LLApp* app); |
| 43 | virtual ~LLViewerHtmlHelp(); | 47 | virtual ~LLLog(); |
| 44 | 48 | ||
| 45 | /*virtual*/ void show(std::string start_url = "", std::string title = ""); | 49 | virtual void log(const std::string message, LLSD& info); |
| 46 | /*virtual*/ BOOL getFloaterOpened(); | 50 | virtual bool useLegacyLogMessage(const std::string message); |
| 47 | }; | ||
| 48 | 51 | ||
| 49 | extern LLViewerHtmlHelp gViewerHtmlHelp; | 52 | private: |
| 53 | LLLogImpl* mImpl; | ||
| 54 | }; | ||
| 50 | 55 | ||
| 51 | #endif // LL_LLFLOATERHTMLHELP_H | 56 | #endif /* LL_LLLOG_H */ |
| 52 | 57 | ||
| 53 | #endif // LL_LIBXUL_ENABLED | ||
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h index f6157c4..ba39098 100644 --- a/linden/indra/llcommon/lllslconstants.h +++ b/linden/indra/llcommon/lllslconstants.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/llcommon/llmap.h b/linden/indra/llcommon/llmap.h index d26ad0f..5f74d22 100644 --- a/linden/indra/llcommon/llmap.h +++ b/linden/indra/llcommon/llmap.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/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp index 2df7071..0f08877 100644 --- a/linden/indra/llcommon/llmemory.cpp +++ b/linden/indra/llcommon/llmemory.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/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h index 1819745..8a3ca0b 100644 --- a/linden/indra/llcommon/llmemory.h +++ b/linden/indra/llcommon/llmemory.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/llcommon/llmemorystream.cpp b/linden/indra/llcommon/llmemorystream.cpp index bb1ac26..bcb1874 100644 --- a/linden/indra/llcommon/llmemorystream.cpp +++ b/linden/indra/llcommon/llmemorystream.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llmemorystream.h b/linden/indra/llcommon/llmemorystream.h index b2c5726..3d5e6db 100644 --- a/linden/indra/llcommon/llmemorystream.h +++ b/linden/indra/llcommon/llmemorystream.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h index 0dba663..df228a6 100644 --- a/linden/indra/llcommon/llmemtype.h +++ b/linden/indra/llcommon/llmemtype.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/llcommon/llmetrics.cpp b/linden/indra/llcommon/llmetrics.cpp index 4f01636..7cdcff4 100644 --- a/linden/indra/llcommon/llmetrics.cpp +++ b/linden/indra/llcommon/llmetrics.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llmetrics.h b/linden/indra/llcommon/llmetrics.h index 07121c8..bfde659 100644 --- a/linden/indra/llcommon/llmetrics.h +++ b/linden/indra/llcommon/llmetrics.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp index 9341dc1..4d449ff 100644 --- a/linden/indra/llcommon/llmortician.cpp +++ b/linden/indra/llcommon/llmortician.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, |
| @@ -33,20 +33,20 @@ | |||
| 33 | 33 | ||
| 34 | #include <list> | 34 | #include <list> |
| 35 | 35 | ||
| 36 | std::list<LLMortician*> gGraveyard; | 36 | std::list<LLMortician*> LLMortician::sGraveyard; |
| 37 | 37 | ||
| 38 | BOOL LLMortician::sDestroyImmediate = FALSE; | 38 | BOOL LLMortician::sDestroyImmediate = FALSE; |
| 39 | 39 | ||
| 40 | LLMortician::~LLMortician() | 40 | LLMortician::~LLMortician() |
| 41 | { | 41 | { |
| 42 | gGraveyard.remove(this); | 42 | sGraveyard.remove(this); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | void LLMortician::updateClass() | 45 | void LLMortician::updateClass() |
| 46 | { | 46 | { |
| 47 | while (!gGraveyard.empty()) | 47 | while (!sGraveyard.empty()) |
| 48 | { | 48 | { |
| 49 | LLMortician* dead = gGraveyard.front(); | 49 | LLMortician* dead = sGraveyard.front(); |
| 50 | delete dead; | 50 | delete dead; |
| 51 | } | 51 | } |
| 52 | } | 52 | } |
| @@ -56,7 +56,7 @@ void LLMortician::die() | |||
| 56 | // It is valid to call die() more than once on something that hasn't died yet | 56 | // It is valid to call die() more than once on something that hasn't died yet |
| 57 | if (sDestroyImmediate) | 57 | if (sDestroyImmediate) |
| 58 | { | 58 | { |
| 59 | // *NOTE: This is a hack to ensure destruction order on shutdown. | 59 | // *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes). |
| 60 | mIsDead = TRUE; | 60 | mIsDead = TRUE; |
| 61 | delete this; | 61 | delete this; |
| 62 | return; | 62 | return; |
| @@ -64,7 +64,7 @@ void LLMortician::die() | |||
| 64 | else if (!mIsDead) | 64 | else if (!mIsDead) |
| 65 | { | 65 | { |
| 66 | mIsDead = TRUE; | 66 | mIsDead = TRUE; |
| 67 | gGraveyard.push_back(this); | 67 | sGraveyard.push_back(this); |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | 70 | ||
diff --git a/linden/indra/llcommon/llmortician.h b/linden/indra/llcommon/llmortician.h index 3a35513..5aed8bf 100644 --- a/linden/indra/llcommon/llmortician.h +++ b/linden/indra/llcommon/llmortician.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, |
| @@ -50,6 +50,8 @@ private: | |||
| 50 | static BOOL sDestroyImmediate; | 50 | static BOOL sDestroyImmediate; |
| 51 | 51 | ||
| 52 | BOOL mIsDead; | 52 | BOOL mIsDead; |
| 53 | |||
| 54 | static std::list<LLMortician*> sGraveyard; | ||
| 53 | }; | 55 | }; |
| 54 | 56 | ||
| 55 | #endif | 57 | #endif |
diff --git a/linden/indra/llcommon/llnametable.h b/linden/indra/llcommon/llnametable.h index 7b8e295..16b9358 100644 --- a/linden/indra/llcommon/llnametable.h +++ b/linden/indra/llcommon/llnametable.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/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h index bb07f5d..8bcad34 100644 --- a/linden/indra/llcommon/llpreprocessor.h +++ b/linden/indra/llcommon/llpreprocessor.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/llcommon/llpriqueuemap.h b/linden/indra/llcommon/llpriqueuemap.h index d48db47..ad79683 100644 --- a/linden/indra/llcommon/llpriqueuemap.h +++ b/linden/indra/llcommon/llpriqueuemap.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/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp index eb136f5..d67a9c4 100644 --- a/linden/indra/llcommon/llprocessor.cpp +++ b/linden/indra/llcommon/llprocessor.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/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h index 6c2b431..a188b1a 100644 --- a/linden/indra/llcommon/llprocessor.h +++ b/linden/indra/llcommon/llprocessor.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/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h index 52473bb..df35d30 100644 --- a/linden/indra/llcommon/llptrskiplist.h +++ b/linden/indra/llcommon/llptrskiplist.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/llcommon/llptrskipmap.h b/linden/indra/llcommon/llptrskipmap.h index 82cddf1..b369d77 100644 --- a/linden/indra/llcommon/llptrskipmap.h +++ b/linden/indra/llcommon/llptrskipmap.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/llcommon/llqueuedthread.cpp b/linden/indra/llcommon/llqueuedthread.cpp index c964e7a..67ce9a2 100644 --- a/linden/indra/llcommon/llqueuedthread.cpp +++ b/linden/indra/llcommon/llqueuedthread.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/llcommon/llqueuedthread.h b/linden/indra/llcommon/llqueuedthread.h index 8ad2251..e3c9c5c 100644 --- a/linden/indra/llcommon/llqueuedthread.h +++ b/linden/indra/llcommon/llqueuedthread.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/llcommon/llrun.cpp b/linden/indra/llcommon/llrun.cpp index 100d65f..d13b863 100644 --- a/linden/indra/llcommon/llrun.cpp +++ b/linden/indra/llcommon/llrun.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llrun.h b/linden/indra/llcommon/llrun.h index 2a8c0e2..443eb41 100644 --- a/linden/indra/llcommon/llrun.h +++ b/linden/indra/llcommon/llrun.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp index a6e504a..fa0531b 100644 --- a/linden/indra/llcommon/llsd.cpp +++ b/linden/indra/llcommon/llsd.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, |
| @@ -35,6 +35,7 @@ | |||
| 35 | #include "llerror.h" | 35 | #include "llerror.h" |
| 36 | #include "../llmath/llmath.h" | 36 | #include "../llmath/llmath.h" |
| 37 | #include "llformat.h" | 37 | #include "llformat.h" |
| 38 | #include "llsdserialize.h" | ||
| 38 | 39 | ||
| 39 | #ifndef LL_RELEASE_FOR_DOWNLOAD | 40 | #ifndef LL_RELEASE_FOR_DOWNLOAD |
| 40 | #define NAME_UNNAMED_NAMESPACE | 41 | #define NAME_UNNAMED_NAMESPACE |
| @@ -765,6 +766,44 @@ const LLSD& LLSD::operator[](Integer i) const | |||
| 765 | U32 LLSD::allocationCount() { return Impl::sAllocationCount; } | 766 | U32 LLSD::allocationCount() { return Impl::sAllocationCount; } |
| 766 | U32 LLSD::outstandingCount() { return Impl::sOutstandingCount; } | 767 | U32 LLSD::outstandingCount() { return Impl::sOutstandingCount; } |
| 767 | 768 | ||
| 769 | static const char *llsd_dump(const LLSD &llsd, bool useXMLFormat) | ||
| 770 | { | ||
| 771 | // sStorage is used to hold the string representation of the llsd last | ||
| 772 | // passed into this function. If this function is never called (the | ||
| 773 | // normal case when not debugging), nothing is allocated. Otherwise | ||
| 774 | // sStorage will point to the result of the last call. This will actually | ||
| 775 | // be one leak, but since this is used only when running under the | ||
| 776 | // debugger, it should not be an issue. | ||
| 777 | static char *sStorage = NULL; | ||
| 778 | delete[] sStorage; | ||
| 779 | std::string out_string; | ||
| 780 | { | ||
| 781 | std::ostringstream out; | ||
| 782 | if (useXMLFormat) | ||
| 783 | out << LLSDXMLStreamer(llsd); | ||
| 784 | else | ||
| 785 | out << LLSDNotationStreamer(llsd); | ||
| 786 | out_string = out.str(); | ||
| 787 | } | ||
| 788 | int len = out_string.length(); | ||
| 789 | sStorage = new char[len + 1]; | ||
| 790 | memcpy(sStorage, out_string.c_str(), len); | ||
| 791 | sStorage[len] = '\0'; | ||
| 792 | return sStorage; | ||
| 793 | } | ||
| 794 | |||
| 795 | /// Returns XML version of llsd -- only to be called from debugger | ||
| 796 | const char *LLSD::dumpXML(const LLSD &llsd) | ||
| 797 | { | ||
| 798 | return llsd_dump(llsd, true); | ||
| 799 | } | ||
| 800 | |||
| 801 | /// Returns Notation version of llsd -- only to be called from debugger | ||
| 802 | const char *LLSD::dump(const LLSD &llsd) | ||
| 803 | { | ||
| 804 | return llsd_dump(llsd, false); | ||
| 805 | } | ||
| 806 | |||
| 768 | LLSD::map_iterator LLSD::beginMap() { return makeMap(impl).beginMap(); } | 807 | LLSD::map_iterator LLSD::beginMap() { return makeMap(impl).beginMap(); } |
| 769 | LLSD::map_iterator LLSD::endMap() { return makeMap(impl).endMap(); } | 808 | LLSD::map_iterator LLSD::endMap() { return makeMap(impl).endMap(); } |
| 770 | LLSD::map_const_iterator LLSD::beginMap() const { return safe(impl).beginMap(); } | 809 | LLSD::map_const_iterator LLSD::beginMap() const { return safe(impl).beginMap(); } |
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h index e9e5a7f..3f53735 100644 --- a/linden/indra/llcommon/llsd.h +++ b/linden/indra/llcommon/llsd.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, |
| @@ -331,6 +331,16 @@ public: | |||
| 331 | static U32 allocationCount(); ///< how many Impls have been made | 331 | static U32 allocationCount(); ///< how many Impls have been made |
| 332 | static U32 outstandingCount(); ///< how many Impls are still alive | 332 | static U32 outstandingCount(); ///< how many Impls are still alive |
| 333 | //@} | 333 | //@} |
| 334 | |||
| 335 | private: | ||
| 336 | /** @name Debugging Interface */ | ||
| 337 | //@{ | ||
| 338 | /// Returns XML version of llsd -- only to be called from debugger | ||
| 339 | static const char *dumpXML(const LLSD &llsd); | ||
| 340 | |||
| 341 | /// Returns Notation version of llsd -- only to be called from debugger | ||
| 342 | static const char *dump(const LLSD &llsd); | ||
| 343 | //@} | ||
| 334 | }; | 344 | }; |
| 335 | 345 | ||
| 336 | struct llsd_select_bool : public std::unary_function<LLSD, LLSD::Boolean> | 346 | struct llsd_select_bool : public std::unary_function<LLSD, LLSD::Boolean> |
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp index e17e73e..7813cf0 100644 --- a/linden/indra/llcommon/llsdserialize.cpp +++ b/linden/indra/llcommon/llsdserialize.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llsdserialize.h b/linden/indra/llcommon/llsdserialize.h index f3fc54e..e1e81d5 100644 --- a/linden/indra/llcommon/llsdserialize.h +++ b/linden/indra/llcommon/llsdserialize.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp index 4537aeb..b8adcf1 100644 --- a/linden/indra/llcommon/llsdserialize_xml.cpp +++ b/linden/indra/llcommon/llsdserialize_xml.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/llcommon/llsdserialize_xml.h b/linden/indra/llcommon/llsdserialize_xml.h index c793a4e..454d3d1 100644 --- a/linden/indra/llcommon/llsdserialize_xml.h +++ b/linden/indra/llcommon/llsdserialize_xml.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/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp index c4be282..d1ccce0 100644 --- a/linden/indra/llcommon/llsdutil.cpp +++ b/linden/indra/llcommon/llsdutil.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
| @@ -301,3 +301,123 @@ char* ll_pretty_print_sd(const LLSD& sd) | |||
| 301 | buffer[bufferSize - 1] = '\0'; | 301 | buffer[bufferSize - 1] = '\0'; |
| 302 | return buffer; | 302 | return buffer; |
| 303 | } | 303 | } |
| 304 | |||
| 305 | //compares the structure of an LLSD to a template LLSD and stores the | ||
| 306 | //"valid" values in a 3rd LLSD. Default values are stored in the template | ||
| 307 | // | ||
| 308 | //If the llsd to test has a specific key to a map and the values | ||
| 309 | //are not of the same type, false is returned or if the LLSDs are not | ||
| 310 | //of the same value. Ordering of arrays matters | ||
| 311 | //Otherwise, returns true | ||
| 312 | BOOL compare_llsd_with_template( | ||
| 313 | const LLSD& llsd_to_test, | ||
| 314 | const LLSD& template_llsd, | ||
| 315 | LLSD& resultant_llsd) | ||
| 316 | { | ||
| 317 | if ( | ||
| 318 | llsd_to_test.isUndefined() && | ||
| 319 | template_llsd.isDefined() ) | ||
| 320 | { | ||
| 321 | resultant_llsd = template_llsd; | ||
| 322 | return TRUE; | ||
| 323 | } | ||
| 324 | else if ( llsd_to_test.type() != template_llsd.type() ) | ||
| 325 | { | ||
| 326 | resultant_llsd = LLSD(); | ||
| 327 | return FALSE; | ||
| 328 | } | ||
| 329 | |||
| 330 | if ( llsd_to_test.isArray() ) | ||
| 331 | { | ||
| 332 | //they are both arrays | ||
| 333 | //we loop over all the items in the template | ||
| 334 | //verifying that the to_test has a subset (in the same order) | ||
| 335 | //any shortcoming in the testing_llsd are just taken | ||
| 336 | //to be the rest of the template | ||
| 337 | LLSD data; | ||
| 338 | LLSD::array_const_iterator test_iter; | ||
| 339 | LLSD::array_const_iterator template_iter; | ||
| 340 | |||
| 341 | resultant_llsd = LLSD::emptyArray(); | ||
| 342 | test_iter = llsd_to_test.beginArray(); | ||
| 343 | |||
| 344 | for ( | ||
| 345 | template_iter = template_llsd.beginArray(); | ||
| 346 | (template_iter != template_llsd.endArray() && | ||
| 347 | test_iter != llsd_to_test.endArray()); | ||
| 348 | ++template_iter) | ||
| 349 | { | ||
| 350 | if ( !compare_llsd_with_template( | ||
| 351 | *test_iter, | ||
| 352 | *template_iter, | ||
| 353 | data) ) | ||
| 354 | { | ||
| 355 | resultant_llsd = LLSD(); | ||
| 356 | return FALSE; | ||
| 357 | } | ||
| 358 | else | ||
| 359 | { | ||
| 360 | resultant_llsd.append(data); | ||
| 361 | } | ||
| 362 | |||
| 363 | ++test_iter; | ||
| 364 | } | ||
| 365 | |||
| 366 | //so either the test or the template ended | ||
| 367 | //we do another loop now to the end of the template | ||
| 368 | //grabbing the default values | ||
| 369 | for (; | ||
| 370 | template_iter != template_llsd.endArray(); | ||
| 371 | ++template_iter) | ||
| 372 | { | ||
| 373 | resultant_llsd.append(*template_iter); | ||
| 374 | } | ||
| 375 | } | ||
| 376 | else if ( llsd_to_test.isMap() ) | ||
| 377 | { | ||
| 378 | //now we loop over the keys of the two maps | ||
| 379 | //any excess is taken from the template | ||
| 380 | //excess is ignored in the test | ||
| 381 | LLSD value; | ||
| 382 | LLSD::map_const_iterator template_iter; | ||
| 383 | |||
| 384 | resultant_llsd = LLSD::emptyMap(); | ||
| 385 | for ( | ||
| 386 | template_iter = template_llsd.beginMap(); | ||
| 387 | template_iter != template_llsd.endMap(); | ||
| 388 | ++template_iter) | ||
| 389 | { | ||
| 390 | if ( llsd_to_test.has(template_iter->first) ) | ||
| 391 | { | ||
| 392 | //the test LLSD has the same key | ||
| 393 | if ( !compare_llsd_with_template( | ||
| 394 | llsd_to_test[template_iter->first], | ||
| 395 | template_iter->second, | ||
| 396 | value) ) | ||
| 397 | { | ||
| 398 | resultant_llsd = LLSD(); | ||
| 399 | return FALSE; | ||
| 400 | } | ||
| 401 | else | ||
| 402 | { | ||
| 403 | resultant_llsd[template_iter->first] = value; | ||
| 404 | } | ||
| 405 | } | ||
| 406 | else | ||
| 407 | { | ||
| 408 | //test llsd doesn't have it...take the | ||
| 409 | //template as default value | ||
| 410 | resultant_llsd[template_iter->first] = | ||
| 411 | template_iter->second; | ||
| 412 | } | ||
| 413 | } | ||
| 414 | } | ||
| 415 | else | ||
| 416 | { | ||
| 417 | //of same type...take the test llsd's value | ||
| 418 | resultant_llsd = llsd_to_test; | ||
| 419 | } | ||
| 420 | |||
| 421 | |||
| 422 | return TRUE; | ||
| 423 | } | ||
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h index da6b9a2..c058185 100644 --- a/linden/indra/llcommon/llsdutil.h +++ b/linden/indra/llcommon/llsdutil.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
| @@ -91,4 +91,14 @@ char* ll_print_sd(const LLSD& sd); | |||
| 91 | // Serializes sd to static buffer and returns pointer, using "pretty printing" mode. | 91 | // Serializes sd to static buffer and returns pointer, using "pretty printing" mode. |
| 92 | char* ll_pretty_print_sd(const LLSD& sd); | 92 | char* ll_pretty_print_sd(const LLSD& sd); |
| 93 | 93 | ||
| 94 | //compares the structure of an LLSD to a template LLSD and stores the | ||
| 95 | //"valid" values in a 3rd LLSD. Default values | ||
| 96 | //are pulled from the template. Ordering of arrays matters | ||
| 97 | //Returns false if the test is of same type but values differ in type | ||
| 98 | //Otherwise, returns true | ||
| 99 | BOOL compare_llsd_with_template( | ||
| 100 | const LLSD& llsd_to_test, | ||
| 101 | const LLSD& template_llsd, | ||
| 102 | LLSD& resultant_llsd); | ||
| 103 | |||
| 94 | #endif // LL_LLSDUTIL_H | 104 | #endif // LL_LLSDUTIL_H |
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp index 4ec52b4..46b8cde 100644 --- a/linden/indra/llcommon/llsecondlifeurls.cpp +++ b/linden/indra/llcommon/llsecondlifeurls.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, |
| @@ -62,6 +62,9 @@ const char AMD_AGP_URL[] = | |||
| 62 | const char VIA_URL[] = | 62 | const char VIA_URL[] = |
| 63 | "http://secondlife.com/support/"; | 63 | "http://secondlife.com/support/"; |
| 64 | 64 | ||
| 65 | const char SUPPORT_URL[] = | ||
| 66 | "http://secondlife.com/support/"; | ||
| 67 | |||
| 65 | const char INTEL_CHIPSET_URL[] = | 68 | const char INTEL_CHIPSET_URL[] = |
| 66 | "http://secondlife.com/support/"; | 69 | "http://secondlife.com/support/"; |
| 67 | 70 | ||
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h index 7388306..3fe086a 100644 --- a/linden/indra/llcommon/llsecondlifeurls.h +++ b/linden/indra/llcommon/llsecondlifeurls.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, |
| @@ -57,6 +57,9 @@ extern const char DIRECTX_9_URL[]; | |||
| 57 | // Out of date VIA chipset | 57 | // Out of date VIA chipset |
| 58 | extern const char VIA_URL[]; | 58 | extern const char VIA_URL[]; |
| 59 | 59 | ||
| 60 | // Support URL | ||
| 61 | extern const char SUPPORT_URL[]; | ||
| 62 | |||
| 60 | // Linden Blogs page | 63 | // Linden Blogs page |
| 61 | extern const char BLOGS_URL[]; | 64 | extern const char BLOGS_URL[]; |
| 62 | 65 | ||
diff --git a/linden/indra/llcommon/llsimplehash.h b/linden/indra/llcommon/llsimplehash.h index 44ec37f..f3b5fe8 100644 --- a/linden/indra/llcommon/llsimplehash.h +++ b/linden/indra/llcommon/llsimplehash.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/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h index 182b165..78e6f0a 100644 --- a/linden/indra/llcommon/llskiplist.h +++ b/linden/indra/llcommon/llskiplist.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/llcommon/llskipmap.h b/linden/indra/llcommon/llskipmap.h index d8030e9..350bebd 100644 --- a/linden/indra/llcommon/llskipmap.h +++ b/linden/indra/llcommon/llskipmap.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/llcommon/llstack.h b/linden/indra/llcommon/llstack.h index 24c29cd..ffd5875 100644 --- a/linden/indra/llcommon/llstack.h +++ b/linden/indra/llcommon/llstack.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/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp index e7bfb20..11e4c64 100644 --- a/linden/indra/llcommon/llstat.cpp +++ b/linden/indra/llcommon/llstat.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/llcommon/llstat.h b/linden/indra/llcommon/llstat.h index e09952f..a0a86e6 100644 --- a/linden/indra/llcommon/llstat.h +++ b/linden/indra/llcommon/llstat.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/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h index a41b789..6fa61e1 100644 --- a/linden/indra/llcommon/llstatenums.h +++ b/linden/indra/llcommon/llstatenums.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/llcommon/llstl.h b/linden/indra/llcommon/llstl.h index 5828649..2719888 100644 --- a/linden/indra/llcommon/llstl.h +++ b/linden/indra/llcommon/llstl.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/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp index d3f5803..5419b24 100644 --- a/linden/indra/llcommon/llstreamtools.cpp +++ b/linden/indra/llcommon/llstreamtools.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/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h index f3af931..0114e4c 100644 --- a/linden/indra/llcommon/llstreamtools.h +++ b/linden/indra/llcommon/llstreamtools.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/llcommon/llstrider.h b/linden/indra/llcommon/llstrider.h index 2c6f3d0..c29c09b 100644 --- a/linden/indra/llcommon/llstrider.h +++ b/linden/indra/llcommon/llstrider.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/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp index b99121e..73c80e7 100644 --- a/linden/indra/llcommon/llstring.cpp +++ b/linden/indra/llcommon/llstring.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, |
| @@ -246,6 +246,84 @@ LLWString utf16str_to_wstring(const llutf16string &utf16str) | |||
| 246 | return utf16str_to_wstring(utf16str, len); | 246 | return utf16str_to_wstring(utf16str, len); |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | // Length in llwchar (UTF-32) of the first len units (16 bits) of the given UTF-16 string. | ||
| 250 | S32 utf16str_wstring_length(const llutf16string &utf16str, const S32 utf16_len) | ||
| 251 | { | ||
| 252 | S32 surrogate_pairs = 0; | ||
| 253 | // ... craziness to make gcc happy (llutf16string.c_str() is tweaked on linux): | ||
| 254 | const U16 *const utf16_chars = &(*(utf16str.begin())); | ||
| 255 | S32 i = 0; | ||
| 256 | while (i < utf16_len) | ||
| 257 | { | ||
| 258 | const U16 c = utf16_chars[i++]; | ||
| 259 | if (c >= 0xD800 && c <= 0xDBFF) // See http://en.wikipedia.org/wiki/UTF-16 | ||
| 260 | { // Have first byte of a surrogate pair | ||
| 261 | if (i >= utf16_len) | ||
| 262 | { | ||
| 263 | break; | ||
| 264 | } | ||
| 265 | const U16 d = utf16_chars[i]; | ||
| 266 | if (d >= 0xDC00 && d <= 0xDFFF) | ||
| 267 | { // Have valid second byte of a surrogate pair | ||
| 268 | surrogate_pairs++; | ||
| 269 | i++; | ||
| 270 | } | ||
| 271 | } | ||
| 272 | } | ||
| 273 | return utf16_len - surrogate_pairs; | ||
| 274 | } | ||
| 275 | |||
| 276 | // Length in utf16string (UTF-16) of wlen wchars beginning at woffset. | ||
| 277 | S32 wstring_utf16_length(const LLWString &wstr, const S32 woffset, const S32 wlen) | ||
| 278 | { | ||
| 279 | const S32 end = llmin((S32)wstr.length(), woffset + wlen); | ||
| 280 | if (end < woffset) | ||
| 281 | { | ||
| 282 | return 0; | ||
| 283 | } | ||
| 284 | else | ||
| 285 | { | ||
| 286 | S32 length = end - woffset; | ||
| 287 | for (S32 i = woffset; i < end; i++) | ||
| 288 | { | ||
| 289 | if (wstr[i] >= 0x10000) | ||
| 290 | { | ||
| 291 | length++; | ||
| 292 | } | ||
| 293 | } | ||
| 294 | return length; | ||
| 295 | } | ||
| 296 | } | ||
| 297 | |||
| 298 | // Given a wstring and an offset in it, returns the length as wstring (i.e., | ||
| 299 | // number of llwchars) of the longest substring that starts at the offset | ||
| 300 | // and whose equivalent utf-16 string does not exceeds the given utf16_length. | ||
| 301 | S32 wstring_wstring_length_from_utf16_length(const LLWString & wstr, const S32 woffset, const S32 utf16_length, BOOL *unaligned) | ||
| 302 | { | ||
| 303 | const S32 end = wstr.length(); | ||
| 304 | BOOL u = FALSE; | ||
| 305 | S32 n = woffset + utf16_length; | ||
| 306 | S32 i = woffset; | ||
| 307 | while (i < end) | ||
| 308 | { | ||
| 309 | if (wstr[i] >= 0x10000) | ||
| 310 | { | ||
| 311 | --n; | ||
| 312 | } | ||
| 313 | if (i >= n) | ||
| 314 | { | ||
| 315 | u = (i > n); | ||
| 316 | break; | ||
| 317 | } | ||
| 318 | i++; | ||
| 319 | } | ||
| 320 | if (unaligned) | ||
| 321 | { | ||
| 322 | *unaligned = u; | ||
| 323 | } | ||
| 324 | return i - woffset; | ||
| 325 | } | ||
| 326 | |||
| 249 | S32 wchar_utf8_length(const llwchar wc) | 327 | S32 wchar_utf8_length(const llwchar wc) |
| 250 | { | 328 | { |
| 251 | if (wc < 0x80) | 329 | if (wc < 0x80) |
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h index cd58d11..82ebdc9 100644 --- a/linden/indra/llcommon/llstring.h +++ b/linden/indra/llcommon/llstring.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, |
| @@ -299,6 +299,10 @@ public: | |||
| 299 | // a.k.a. strdictcmp() | 299 | // a.k.a. strdictcmp() |
| 300 | static S32 compareDict(const std::basic_string<T>& a, const std::basic_string<T>& b); | 300 | static S32 compareDict(const std::basic_string<T>& a, const std::basic_string<T>& b); |
| 301 | 301 | ||
| 302 | // Case *in*sensitive comparison with good handling of numbers. Does not use current locale. | ||
| 303 | // a.k.a. strdictcmp() | ||
| 304 | static S32 compareDictInsensitive(const std::basic_string<T>& a, const std::basic_string<T>& b); | ||
| 305 | |||
| 302 | // Puts compareDict() in a form appropriate for LL container classes to use for sorting. | 306 | // Puts compareDict() in a form appropriate for LL container classes to use for sorting. |
| 303 | static BOOL precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b ); | 307 | static BOOL precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b ); |
| 304 | 308 | ||
| @@ -310,7 +314,7 @@ public: | |||
| 310 | // Copies src into dst at a given offset. | 314 | // Copies src into dst at a given offset. |
| 311 | static void copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset); | 315 | static void copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset); |
| 312 | 316 | ||
| 313 | #ifdef _DEBUG | 317 | #ifdef _DEBUG |
| 314 | static void testHarness(); | 318 | static void testHarness(); |
| 315 | #endif | 319 | #endif |
| 316 | 320 | ||
| @@ -433,6 +437,15 @@ S32 wchar_utf8_length(const llwchar wc); | |||
| 433 | 437 | ||
| 434 | std::string utf8str_tolower(const std::string& utf8str); | 438 | std::string utf8str_tolower(const std::string& utf8str); |
| 435 | 439 | ||
| 440 | // Length in llwchar (UTF-32) of the first len units (16 bits) of the given UTF-16 string. | ||
| 441 | S32 utf16str_wstring_length(const llutf16string &utf16str, S32 len); | ||
| 442 | |||
| 443 | // Length in utf16string (UTF-16) of wlen wchars beginning at woffset. | ||
| 444 | S32 wstring_utf16_length(const LLWString & wstr, S32 woffset, S32 wlen); | ||
| 445 | |||
| 446 | // Length in wstring (i.e., llwchar count) of a part of a wstring specified by utf16 length (i.e., utf16 units.) | ||
| 447 | S32 wstring_wstring_length_from_utf16_length(const LLWString & wstr, S32 woffset, S32 utf16_length, BOOL *unaligned = NULL); | ||
| 448 | |||
| 436 | /** | 449 | /** |
| 437 | * @brief Properly truncate a utf8 string to a maximum byte count. | 450 | * @brief Properly truncate a utf8 string to a maximum byte count. |
| 438 | * | 451 | * |
| @@ -440,7 +453,7 @@ std::string utf8str_tolower(const std::string& utf8str); | |||
| 440 | * happens in the middle of a glyph. If max_len is longer than the | 453 | * happens in the middle of a glyph. If max_len is longer than the |
| 441 | * string passed in, the return value == utf8str. | 454 | * string passed in, the return value == utf8str. |
| 442 | * @param utf8str A valid utf8 string to truncate. | 455 | * @param utf8str A valid utf8 string to truncate. |
| 443 | * @param max_len The maximum number of bytes in the returne | 456 | * @param max_len The maximum number of bytes in the return value. |
| 444 | * @return Returns a valid utf8 string with byte count <= max_len. | 457 | * @return Returns a valid utf8 string with byte count <= max_len. |
| 445 | */ | 458 | */ |
| 446 | std::string utf8str_truncate(const std::string& utf8str, const S32 max_len); | 459 | std::string utf8str_truncate(const std::string& utf8str, const S32 max_len); |
| @@ -699,6 +712,39 @@ S32 LLStringBase<T>::compareDict(const std::basic_string<T>& astr, const std::ba | |||
| 699 | return ca-cb; | 712 | return ca-cb; |
| 700 | } | 713 | } |
| 701 | 714 | ||
| 715 | template<class T> | ||
| 716 | S32 LLStringBase<T>::compareDictInsensitive(const std::basic_string<T>& astr, const std::basic_string<T>& bstr) | ||
| 717 | { | ||
| 718 | const T* a = astr.c_str(); | ||
| 719 | const T* b = bstr.c_str(); | ||
| 720 | T ca, cb; | ||
| 721 | S32 ai, bi, cnt = 0; | ||
| 722 | |||
| 723 | ca = *(a++); | ||
| 724 | cb = *(b++); | ||
| 725 | while( ca && cb ){ | ||
| 726 | if( LLStringOps::isUpper(ca) ){ ca = LLStringOps::toLower(ca); } | ||
| 727 | if( LLStringOps::isUpper(cb) ){ cb = LLStringOps::toLower(cb); } | ||
| 728 | if( LLStringOps::isDigit(ca) ){ | ||
| 729 | if( cnt-->0 ){ | ||
| 730 | if( cb!=ca ) break; | ||
| 731 | }else{ | ||
| 732 | if( !LLStringOps::isDigit(cb) ) break; | ||
| 733 | for(ai=0; LLStringOps::isDigit(a[ai]); ai++); | ||
| 734 | for(bi=0; LLStringOps::isDigit(b[bi]); bi++); | ||
| 735 | if( ai<bi ){ ca=0; break; } | ||
| 736 | if( bi<ai ){ cb=0; break; } | ||
| 737 | if( ca!=cb ) break; | ||
| 738 | cnt = ai; | ||
| 739 | } | ||
| 740 | }else if( ca!=cb ){ break; | ||
| 741 | } | ||
| 742 | ca = *(a++); | ||
| 743 | cb = *(b++); | ||
| 744 | } | ||
| 745 | return ca-cb; | ||
| 746 | } | ||
| 747 | |||
| 702 | // Puts compareDict() in a form appropriate for LL container classes to use for sorting. | 748 | // Puts compareDict() in a form appropriate for LL container classes to use for sorting. |
| 703 | // static | 749 | // static |
| 704 | template<class T> | 750 | template<class T> |
diff --git a/linden/indra/llcommon/llstringtable.cpp b/linden/indra/llcommon/llstringtable.cpp index a800b1d..c2de6f7 100644 --- a/linden/indra/llcommon/llstringtable.cpp +++ b/linden/indra/llcommon/llstringtable.cpp | |||
| @@ -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/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h index da6f172..4e8f7b7 100644 --- a/linden/indra/llcommon/llstringtable.h +++ b/linden/indra/llcommon/llstringtable.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/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp index 544eee4..2a6e466 100644 --- a/linden/indra/llcommon/llsys.cpp +++ b/linden/indra/llcommon/llsys.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/llcommon/llsys.h b/linden/indra/llcommon/llsys.h index aacac83..da7f07e 100644 --- a/linden/indra/llcommon/llsys.h +++ b/linden/indra/llcommon/llsys.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/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp index bff2eb5..c0e92ca 100644 --- a/linden/indra/llcommon/llthread.cpp +++ b/linden/indra/llcommon/llthread.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/llcommon/llthread.h b/linden/indra/llcommon/llthread.h index 318170e..5c71c34 100644 --- a/linden/indra/llcommon/llthread.h +++ b/linden/indra/llcommon/llthread.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/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp index 5d30ec3..a421dce 100644 --- a/linden/indra/llcommon/lltimer.cpp +++ b/linden/indra/llcommon/lltimer.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/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h index b40e342..bd4c274 100644 --- a/linden/indra/llcommon/lltimer.h +++ b/linden/indra/llcommon/lltimer.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/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp index 536d5b9..7db8f3b 100644 --- a/linden/indra/llcommon/lluri.cpp +++ b/linden/indra/llcommon/lluri.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
| @@ -43,28 +43,68 @@ | |||
| 43 | // system includes | 43 | // system includes |
| 44 | #include <boost/tokenizer.hpp> | 44 | #include <boost/tokenizer.hpp> |
| 45 | 45 | ||
| 46 | void encode_character(std::ostream& ostr, std::string::value_type val) | ||
| 47 | { | ||
| 48 | ostr << "%" << std::uppercase << std::hex << std::setw(2) << std::setfill('0') | ||
| 49 | // VWR-4010 Cannot cast to U32 because sign-extension on | ||
| 50 | // chars > 128 will result in FFFFFFC3 instead of F3. | ||
| 51 | << static_cast<S32>(static_cast<U8>(val)); | ||
| 52 | } | ||
| 53 | |||
| 46 | // static | 54 | // static |
| 47 | std::string LLURI::escape(const std::string& str, const std::string & allowed) | 55 | std::string LLURI::escape( |
| 56 | const std::string& str, | ||
| 57 | const std::string& allowed, | ||
| 58 | bool is_allowed_sorted) | ||
| 48 | { | 59 | { |
| 49 | std::ostringstream ostr; | 60 | // *NOTE: This size determination feels like a good value to |
| 61 | // me. If someone wante to come up with a more precise heuristic | ||
| 62 | // with some data to back up the assertion that 'sort is good' | ||
| 63 | // then feel free to change this test a bit. | ||
| 64 | if(!is_allowed_sorted && (str.size() > 2 * allowed.size())) | ||
| 65 | { | ||
| 66 | // if it's already sorted, or if the url is quite long, we | ||
| 67 | // want to optimize this process. | ||
| 68 | std::string sorted_allowed(allowed); | ||
| 69 | std::sort(sorted_allowed.begin(), sorted_allowed.end()); | ||
| 70 | return escape(str, sorted_allowed, true); | ||
| 71 | } | ||
| 50 | 72 | ||
| 73 | std::ostringstream ostr; | ||
| 51 | std::string::const_iterator it = str.begin(); | 74 | std::string::const_iterator it = str.begin(); |
| 52 | std::string::const_iterator end = str.end(); | 75 | std::string::const_iterator end = str.end(); |
| 53 | for(; it != end; ++it) | 76 | std::string::value_type c; |
| 77 | if(is_allowed_sorted) | ||
| 54 | { | 78 | { |
| 55 | std::string::value_type c = *it; | 79 | std::string::const_iterator allowed_begin(allowed.begin()); |
| 56 | if(allowed.find(c) == std::string::npos) | 80 | std::string::const_iterator allowed_end(allowed.end()); |
| 57 | { | 81 | for(; it != end; ++it) |
| 58 | ostr << "%" | 82 | { |
| 59 | << std::uppercase << std::hex << std::setw(2) << std::setfill('0') | 83 | c = *it; |
| 60 | // VWR-4010 Cannot cast to U32 because sign-extension on | 84 | if(std::binary_search(allowed_begin, allowed_end, c)) |
| 61 | // chars > 128 will result in FFFFFFC3 instead of F3. | 85 | { |
| 62 | << static_cast<S32>(static_cast<U8>(c)); | 86 | ostr << c; |
| 63 | } | 87 | } |
| 64 | else | 88 | else |
| 65 | { | 89 | { |
| 66 | ostr << c; | 90 | encode_character(ostr, c); |
| 67 | } | 91 | } |
| 92 | } | ||
| 93 | } | ||
| 94 | else | ||
| 95 | { | ||
| 96 | for(; it != end; ++it) | ||
| 97 | { | ||
| 98 | c = *it; | ||
| 99 | if(allowed.find(c) == std::string::npos) | ||
| 100 | { | ||
| 101 | encode_character(ostr, c); | ||
| 102 | } | ||
| 103 | else | ||
| 104 | { | ||
| 105 | ostr << c; | ||
| 106 | } | ||
| 107 | } | ||
| 68 | } | 108 | } |
| 69 | return ostr.str(); | 109 | return ostr.str(); |
| 70 | } | 110 | } |
| @@ -121,11 +161,18 @@ namespace | |||
| 121 | { return LLURI::escape(s, unreserved() + ":@!$'()*+,="); } // sub_delims - "&;" + ":@" | 161 | { return LLURI::escape(s, unreserved() + ":@!$'()*+,="); } // sub_delims - "&;" + ":@" |
| 122 | } | 162 | } |
| 123 | 163 | ||
| 124 | // TODO: USE CURL!! After http textures gets merged everywhere. | 164 | // *TODO: Consider using curl. After http textures gets merged everywhere. |
| 125 | // static | 165 | // static |
| 126 | std::string LLURI::escape(const std::string& str) | 166 | std::string LLURI::escape(const std::string& str) |
| 127 | { | 167 | { |
| 128 | return escape(str,unreserved() + ":@!$'()*+,="); | 168 | static std::string default_allowed(unreserved() + ":@!$'()*+,=/?&#;"); |
| 169 | static bool initialized = false; | ||
| 170 | if(!initialized) | ||
| 171 | { | ||
| 172 | std::sort(default_allowed.begin(), default_allowed.end()); | ||
| 173 | initialized = true; | ||
| 174 | } | ||
| 175 | return escape(str, default_allowed, true); | ||
| 129 | } | 176 | } |
| 130 | 177 | ||
| 131 | LLURI::LLURI() | 178 | LLURI::LLURI() |
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h index d67051a..d6d235d 100644 --- a/linden/indra/llcommon/lluri.h +++ b/linden/indra/llcommon/lluri.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
| @@ -125,12 +125,52 @@ public: | |||
| 125 | 125 | ||
| 126 | /** @name Escaping Utilities */ | 126 | /** @name Escaping Utilities */ |
| 127 | //@{ | 127 | //@{ |
| 128 | // Escape a string by urlencoding all the characters that aren't | 128 | /** |
| 129 | // in the allowed string. | 129 | * @brief Escape a raw url with a reasonable set of allowed characters. |
| 130 | * | ||
| 131 | * The default set was chosen to match HTTP urls and general | ||
| 132 | * guidelines for naming resources. Passing in a raw url does not | ||
| 133 | * produce well defined results because you really need to know | ||
| 134 | * which segments are path parts because path parts are supposed | ||
| 135 | * to be escaped individually. The default set chosen is: | ||
| 136 | * | ||
| 137 | * ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz | ||
| 138 | * 0123456789 | ||
| 139 | * -._~ | ||
| 140 | * :@!$'()*+,=/?&#; | ||
| 141 | * | ||
| 142 | * *NOTE: This API is basically broken because it does not | ||
| 143 | * allow you to specify significant path characters. For example, | ||
| 144 | * if the filename actually contained a /, then you cannot use | ||
| 145 | * this function to generate the serialized url for that | ||
| 146 | * resource. | ||
| 147 | * | ||
| 148 | * @param str The raw URI to escape. | ||
| 149 | * @return Returns the escaped uri or an empty string. | ||
| 150 | */ | ||
| 130 | static std::string escape(const std::string& str); | 151 | static std::string escape(const std::string& str); |
| 152 | |||
| 153 | /** | ||
| 154 | * @brief Escape a string with a specified set of allowed characters. | ||
| 155 | * | ||
| 156 | * Escape a string by urlencoding all the characters that aren't | ||
| 157 | * in the allowed string. | ||
| 158 | * @param str The raw URI to escape. | ||
| 159 | * @param allowed Character array of allowed characters | ||
| 160 | * @param is_allowed_sorted Optimization hint if allowed array is sorted. | ||
| 161 | * @return Returns the escaped uri or an empty string. | ||
| 162 | */ | ||
| 131 | static std::string escape( | 163 | static std::string escape( |
| 132 | const std::string& str, | 164 | const std::string& str, |
| 133 | const std::string & allowed); | 165 | const std::string& allowed, |
| 166 | bool is_allowed_sorted = false); | ||
| 167 | |||
| 168 | /** | ||
| 169 | * @brief unescape an escaped URI string. | ||
| 170 | * | ||
| 171 | * @param str The escped URI to unescape. | ||
| 172 | * @return Returns the unescaped uri or an empty string. | ||
| 173 | */ | ||
| 134 | static std::string unescape(const std::string& str); | 174 | static std::string unescape(const std::string& str); |
| 135 | //@} | 175 | //@} |
| 136 | 176 | ||
diff --git a/linden/indra/llcommon/lluuidhashmap.h b/linden/indra/llcommon/lluuidhashmap.h index 097ebc9..b2a799b 100644 --- a/linden/indra/llcommon/lluuidhashmap.h +++ b/linden/indra/llcommon/lluuidhashmap.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/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h index fc56403..079fa85 100644 --- a/linden/indra/llcommon/llversionserver.h +++ b/linden/indra/llcommon/llversionserver.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, |
| @@ -35,7 +35,7 @@ | |||
| 35 | const S32 LL_VERSION_MAJOR = 1; | 35 | const S32 LL_VERSION_MAJOR = 1; |
| 36 | const S32 LL_VERSION_MINOR = 18; | 36 | const S32 LL_VERSION_MINOR = 18; |
| 37 | const S32 LL_VERSION_PATCH = 6; | 37 | const S32 LL_VERSION_PATCH = 6; |
| 38 | const S32 LL_VERSION_BUILD = 2; | 38 | const S32 LL_VERSION_BUILD = 76747; |
| 39 | 39 | ||
| 40 | const char * const LL_CHANNEL = "Second Life Server"; | 40 | const char * const LL_CHANNEL = "Second Life Server"; |
| 41 | 41 | ||
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 5a18c3b..6c5a1ce 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.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, |
| @@ -33,9 +33,9 @@ | |||
| 33 | #define LL_LLVERSIONVIEWER_H | 33 | #define LL_LLVERSIONVIEWER_H |
| 34 | 34 | ||
| 35 | const S32 LL_VERSION_MAJOR = 1; | 35 | const S32 LL_VERSION_MAJOR = 1; |
| 36 | const S32 LL_VERSION_MINOR = 18; | 36 | const S32 LL_VERSION_MINOR = 19; |
| 37 | const S32 LL_VERSION_PATCH = 6; | 37 | const S32 LL_VERSION_PATCH = 0; |
| 38 | const S32 LL_VERSION_BUILD = 4; | 38 | const S32 LL_VERSION_BUILD = 0; |
| 39 | 39 | ||
| 40 | const char * const LL_CHANNEL = "Second Life Release"; | 40 | const char * const LL_CHANNEL = "Second Life Release"; |
| 41 | 41 | ||
diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp index 1bc30fd..6301fa1 100644 --- a/linden/indra/llcommon/llworkerthread.cpp +++ b/linden/indra/llcommon/llworkerthread.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/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h index 6795298..58f1ead 100644 --- a/linden/indra/llcommon/llworkerthread.h +++ b/linden/indra/llcommon/llworkerthread.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/llcommon/metaclass.cpp b/linden/indra/llcommon/metaclass.cpp index a8a9fec..5b792b3 100644 --- a/linden/indra/llcommon/metaclass.cpp +++ b/linden/indra/llcommon/metaclass.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/metaclass.h b/linden/indra/llcommon/metaclass.h index 9cd6ec2..05992fb 100644 --- a/linden/indra/llcommon/metaclass.h +++ b/linden/indra/llcommon/metaclass.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/metaclasst.h b/linden/indra/llcommon/metaclasst.h index b04fe40..a54f66c 100644 --- a/linden/indra/llcommon/metaclasst.h +++ b/linden/indra/llcommon/metaclasst.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/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp index 265fcd5..5a8824a 100644 --- a/linden/indra/llcommon/metaproperty.cpp +++ b/linden/indra/llcommon/metaproperty.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/metaproperty.h b/linden/indra/llcommon/metaproperty.h index d1218e8..fbac9ab 100644 --- a/linden/indra/llcommon/metaproperty.h +++ b/linden/indra/llcommon/metaproperty.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/metapropertyt.h b/linden/indra/llcommon/metapropertyt.h index 2df2bfb..5c25ec4 100644 --- a/linden/indra/llcommon/metapropertyt.h +++ b/linden/indra/llcommon/metapropertyt.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/llcommon/processor.h b/linden/indra/llcommon/processor.h index 625c4d5..a6e2291 100644 --- a/linden/indra/llcommon/processor.h +++ b/linden/indra/llcommon/processor.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/llcommon/reflective.cpp b/linden/indra/llcommon/reflective.cpp index d134bc3..54fa96b 100644 --- a/linden/indra/llcommon/reflective.cpp +++ b/linden/indra/llcommon/reflective.cpp | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/reflective.h b/linden/indra/llcommon/reflective.h index 259a3df..fec2790 100644 --- a/linden/indra/llcommon/reflective.h +++ b/linden/indra/llcommon/reflective.h | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
| 18 | * | 18 | * |
| 19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
| 20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
| 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
| 23 | * | 23 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llcommon/reflectivet.h b/linden/indra/llcommon/reflectivet.h index a3eeed6..e960eb1 100644 --- a/linden/indra/llcommon/reflectivet.h +++ b/linden/indra/llcommon/reflectivet.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/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h index 1d048dd..956a9de 100644 --- a/linden/indra/llcommon/roles_constants.h +++ b/linden/indra/llcommon/roles_constants.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, |
| @@ -56,12 +56,12 @@ enum LLRoleChangeType | |||
| 56 | // Powers | 56 | // Powers |
| 57 | // | 57 | // |
| 58 | 58 | ||
| 59 | // KNOWN HOLES: | 59 | // KNOWN HOLES: use these for any single bit powers you need |
| 60 | // bit 0x1 << 37 (GP_OBJECT_RETURN) | 60 | // bit 0x1 << 41 |
| 61 | // bit 0x1 << 46 | ||
| 62 | // bit 0x1 << 49 and above | ||
| 61 | 63 | ||
| 62 | // These powers were removed to make group roles simpler | 64 | // These powers were removed to make group roles simpler |
| 63 | // bit 0x1 << 27 (GP_LAND_ALLOW_SCRIPTS) | ||
| 64 | // bit 0x1 << 16 (GP_LAND_VIEW_OWNED) | ||
| 65 | // bit 0x1 << 41 (GP_ACCOUNTING_VIEW) | 65 | // bit 0x1 << 41 (GP_ACCOUNTING_VIEW) |
| 66 | // bit 0x1 << 46 (GP_PROPOSAL_VIEW) | 66 | // bit 0x1 << 46 (GP_PROPOSAL_VIEW) |
| 67 | 67 | ||
| @@ -116,18 +116,19 @@ const U64 GP_LAND_MANAGE_PASSES = 0x1LL << 31; // Change Sell Pass Settings | |||
| 116 | const U64 GP_LAND_ADMIN = 0x1LL << 32; // Eject and Freeze Users on the land | 116 | const U64 GP_LAND_ADMIN = 0x1LL << 32; // Eject and Freeze Users on the land |
| 117 | 117 | ||
| 118 | // Parcel Content | 118 | // Parcel Content |
| 119 | const U64 GP_LAND_RETURN_GROUP_OWNED= 0x1LL << 48; // Return objects on parcel that are owned by the group | ||
| 120 | const U64 GP_LAND_RETURN_GROUP_SET = 0x1LL << 33; // Return objects on parcel that are set to group | 119 | const U64 GP_LAND_RETURN_GROUP_SET = 0x1LL << 33; // Return objects on parcel that are set to group |
| 121 | const U64 GP_LAND_RETURN_NON_GROUP = 0x1LL << 34; // Return objects on parcel that are not set to group | 120 | const U64 GP_LAND_RETURN_NON_GROUP = 0x1LL << 34; // Return objects on parcel that are not set to group |
| 121 | const U64 GP_LAND_RETURN_GROUP_OWNED= 0x1LL << 48; // Return objects on parcel that are owned by the group | ||
| 122 | |||
| 122 | // Select a power-bit based on an object's relationship to a parcel. | 123 | // Select a power-bit based on an object's relationship to a parcel. |
| 123 | const U64 GP_LAND_RETURN = GP_LAND_RETURN_GROUP_OWNED | 124 | const U64 GP_LAND_RETURN = GP_LAND_RETURN_GROUP_OWNED |
| 124 | | GP_LAND_RETURN_GROUP_SET | 125 | | GP_LAND_RETURN_GROUP_SET |
| 125 | | GP_LAND_RETURN_NON_GROUP; | 126 | | GP_LAND_RETURN_NON_GROUP; |
| 127 | |||
| 126 | const U64 GP_LAND_GARDENING = 0x1LL << 35; // Parcel Gardening - plant and move linden trees | 128 | const U64 GP_LAND_GARDENING = 0x1LL << 35; // Parcel Gardening - plant and move linden trees |
| 127 | 129 | ||
| 128 | // Object Management | 130 | // Object Management |
| 129 | const U64 GP_OBJECT_DEED = 0x1LL << 36; // Deed Object | 131 | const U64 GP_OBJECT_DEED = 0x1LL << 36; // Deed Object |
| 130 | // HOLE -- 0x1LL << 37 | ||
| 131 | const U64 GP_OBJECT_MANIPULATE = 0x1LL << 38; // Manipulate Group Owned Objects (Move, Copy, Mod) | 132 | const U64 GP_OBJECT_MANIPULATE = 0x1LL << 38; // Manipulate Group Owned Objects (Move, Copy, Mod) |
| 132 | const U64 GP_OBJECT_SET_SALE = 0x1LL << 39; // Set Group Owned Object for Sale | 133 | const U64 GP_OBJECT_SET_SALE = 0x1LL << 39; // Set Group Owned Object for Sale |
| 133 | 134 | ||
| @@ -142,17 +143,11 @@ const U64 GP_NOTICES_RECEIVE = 0x1LL << 43; // Receive Notices and View Notice | |||
| 142 | const U64 GP_PROPOSAL_START = 0x1LL << 44; // Start Proposal | 143 | const U64 GP_PROPOSAL_START = 0x1LL << 44; // Start Proposal |
| 143 | const U64 GP_PROPOSAL_VOTE = 0x1LL << 45; // Vote on Proposal | 144 | const U64 GP_PROPOSAL_VOTE = 0x1LL << 45; // Vote on Proposal |
| 144 | 145 | ||
| 145 | const U64 GP_SESSION_JOIN = 0x1LL << 46; //can join session | ||
| 146 | const U64 GP_SESSION_VOICE = 0x1LL << 47; //can hear/talk | ||
| 147 | const U64 GP_SESSION_MODERATOR = 0x1LL << 49; //can mute people's session | ||
| 148 | |||
| 149 | const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE | 146 | const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE |
| 150 | | GP_LAND_ALLOW_SET_HOME | 147 | | GP_LAND_ALLOW_SET_HOME |
| 151 | | GP_NOTICES_RECEIVE | 148 | | GP_NOTICES_RECEIVE |
| 152 | | GP_PROPOSAL_START | 149 | | GP_PROPOSAL_START |
| 153 | | GP_PROPOSAL_VOTE | 150 | | GP_PROPOSAL_VOTE |
| 154 | | GP_SESSION_JOIN | ||
| 155 | | GP_SESSION_VOICE | ||
| 156 | ; | 151 | ; |
| 157 | 152 | ||
| 158 | const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE | 153 | const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE |
| @@ -193,8 +188,5 @@ const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE | |||
| 193 | | GP_PROPOSAL_VOTE | 188 | | GP_PROPOSAL_VOTE |
| 194 | | GP_ROLE_ASSIGN_MEMBER_LIMITED | 189 | | GP_ROLE_ASSIGN_MEMBER_LIMITED |
| 195 | | GP_ROLE_PROPERTIES | 190 | | GP_ROLE_PROPERTIES |
| 196 | | GP_SESSION_MODERATOR | ||
| 197 | | GP_SESSION_JOIN | ||
| 198 | | GP_SESSION_VOICE | ||
| 199 | ; | 191 | ; |
| 200 | #endif | 192 | #endif |
diff --git a/linden/indra/llcommon/stdenums.h b/linden/indra/llcommon/stdenums.h index ab39e9e..22d6a59 100644 --- a/linden/indra/llcommon/stdenums.h +++ b/linden/indra/llcommon/stdenums.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/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h index 9ec2368..c1f5303 100644 --- a/linden/indra/llcommon/stdtypes.h +++ b/linden/indra/llcommon/stdtypes.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/llcommon/string_table.h b/linden/indra/llcommon/string_table.h index c401f04..4de7aac 100644 --- a/linden/indra/llcommon/string_table.h +++ b/linden/indra/llcommon/string_table.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/llcommon/timer.h b/linden/indra/llcommon/timer.h index 6550c81..502de1f 100644 --- a/linden/indra/llcommon/timer.h +++ b/linden/indra/llcommon/timer.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/llcommon/timing.cpp b/linden/indra/llcommon/timing.cpp index 1b97b8e..78d0cb9 100644 --- a/linden/indra/llcommon/timing.cpp +++ b/linden/indra/llcommon/timing.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/llcommon/timing.h b/linden/indra/llcommon/timing.h index 937fa96..20d785a 100644 --- a/linden/indra/llcommon/timing.h +++ b/linden/indra/llcommon/timing.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/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp index a668259..bbeed9f 100644 --- a/linden/indra/llcommon/u64.cpp +++ b/linden/indra/llcommon/u64.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, |
| @@ -107,8 +107,8 @@ F64 U64_to_F64(const U64 value) | |||
| 107 | U64 llstrtou64(const char* str, char** end, S32 base) | 107 | U64 llstrtou64(const char* str, char** end, S32 base) |
| 108 | { | 108 | { |
| 109 | #ifdef LL_WINDOWS | 109 | #ifdef LL_WINDOWS |
| 110 | return _strtoui64(str,end,base); | 110 | return _strtoui64(str,end,base); |
| 111 | #else | 111 | #else |
| 112 | return strtoull(str,end,base); | 112 | return strtoull(str,end,base); |
| 113 | #endif | 113 | #endif |
| 114 | } | 114 | } |
diff --git a/linden/indra/llcommon/u64.h b/linden/indra/llcommon/u64.h index 2b14018..ab06836 100644 --- a/linden/indra/llcommon/u64.h +++ b/linden/indra/llcommon/u64.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, |
| @@ -32,11 +32,41 @@ | |||
| 32 | #ifndef LL_U64_H | 32 | #ifndef LL_U64_H |
| 33 | #define LL_U64_H | 33 | #define LL_U64_H |
| 34 | 34 | ||
| 35 | /** | ||
| 36 | * @brief Forgivingly parse a null terminated character array. | ||
| 37 | * | ||
| 38 | * @param str The string to parse. | ||
| 39 | * @return Returns the first U64 value found in the string or 0 on failure. | ||
| 40 | */ | ||
| 35 | U64 str_to_U64(const char* str); | 41 | U64 str_to_U64(const char* str); |
| 42 | |||
| 43 | /** | ||
| 44 | * @brief Given a U64 value, return a printable representation. | ||
| 45 | * | ||
| 46 | * The client of this function is expected to provide an allocated | ||
| 47 | * buffer. The function then snprintf() into that buffer, so providing | ||
| 48 | * NULL has undefined behavior. Providing a buffer which is too small | ||
| 49 | * will truncate the printable value, so usually you want to declare | ||
| 50 | * the buffer: | ||
| 51 | * | ||
| 52 | * char result[U64_BUF]; | ||
| 53 | * std::cout << "value: " << U64_to_str(value, result, U64_BUF); | ||
| 54 | * | ||
| 55 | * @param value The U64 to turn into a printable character array. | ||
| 56 | * @param result The buffer to use | ||
| 57 | * @param result_size The size of the buffer allocated. Use U64_BUF. | ||
| 58 | * @return Returns the result pointer. | ||
| 59 | */ | ||
| 36 | char* U64_to_str(U64 value, char* result, S32 result_size); | 60 | char* U64_to_str(U64 value, char* result, S32 result_size); |
| 37 | 61 | ||
| 62 | /** | ||
| 63 | * @brief Convert a U64 to the closest F64 value. | ||
| 64 | */ | ||
| 38 | F64 U64_to_F64(const U64 value); | 65 | F64 U64_to_F64(const U64 value); |
| 39 | 66 | ||
| 67 | /** | ||
| 68 | * @brief Helper function to wrap strtoull() which is not available on windows. | ||
| 69 | */ | ||
| 40 | U64 llstrtou64(const char* str, char** end, S32 base); | 70 | U64 llstrtou64(const char* str, char** end, S32 base); |
| 41 | 71 | ||
| 42 | #endif | 72 | #endif |