diff options
| author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
| commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
| tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llcommon | |
| parent | Second Life viewer sources 1.14.0.1 (diff) | |
| download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz | |
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llcommon')
144 files changed, 1278 insertions, 1253 deletions
diff --git a/linden/indra/llcommon/bitpack.cpp b/linden/indra/llcommon/bitpack.cpp deleted file mode 100644 index 813e09c..0000000 --- a/linden/indra/llcommon/bitpack.cpp +++ /dev/null | |||
| @@ -1,167 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * @file bitpack.cpp | ||
| 3 | * @brief Convert data to packed bit stream | ||
| 4 | * | ||
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | ||
| 6 | * | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | ||
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | ||
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | ||
| 10 | * ("Other License"), formally executed by you and Linden Lab. Terms of | ||
| 11 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | ||
| 12 | * online at http://secondlife.com/developers/opensource/gplv2 | ||
| 13 | * | ||
| 14 | * There are special exceptions to the terms and conditions of the GPL as | ||
| 15 | * it is applied to this Source Code. View the full text of the exception | ||
| 16 | * in the file doc/FLOSS-exception.txt in this software distribution, or | ||
| 17 | * online at http://secondlife.com/developers/opensource/flossexception | ||
| 18 | * | ||
| 19 | * By copying, modifying or distributing this software, you acknowledge | ||
| 20 | * that you have read and understood your obligations described above, | ||
| 21 | * and agree to abide by those obligations. | ||
| 22 | * | ||
| 23 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | ||
| 24 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | ||
| 25 | * COMPLETENESS OR PERFORMANCE. | ||
| 26 | */ | ||
| 27 | |||
| 28 | #include "linden_common.h" | ||
| 29 | |||
| 30 | #include "bitpack.h" | ||
| 31 | |||
| 32 | #if 0 | ||
| 33 | #include <stdio.h> | ||
| 34 | #include <stdlib.h> | ||
| 35 | #include "stdtypes.h" | ||
| 36 | |||
| 37 | U8 gLoad, gUnLoad; | ||
| 38 | U32 gLoadSize, gUnLoadSize, gTotalBits; | ||
| 39 | |||
| 40 | const U32 gMaxDataBits = 8; | ||
| 41 | |||
| 42 | ///////////////////////////////////////////////////////////////////////////////////////// | ||
| 43 | #if 0 | ||
| 44 | void bit_pack(U8 *outbase, U32 *outptr, U8 *total_data, U32 total_dsize) | ||
| 45 | { | ||
| 46 | U32 max_data_bits = gMaxDataBits; | ||
| 47 | U32 load_size = gLoadSize, total_bits = gTotalBits; | ||
| 48 | U32 dsize; | ||
| 49 | |||
| 50 | U8 data; | ||
| 51 | U8 load = gLoad; | ||
| 52 | |||
| 53 | while (total_dsize > 0) | ||
| 54 | { | ||
| 55 | if (total_dsize > max_data_bits) | ||
| 56 | { | ||
| 57 | dsize = max_data_bits; | ||
| 58 | total_dsize -= max_data_bits; | ||
| 59 | } | ||
| 60 | else | ||
| 61 | { | ||
| 62 | dsize = total_dsize; | ||
| 63 | total_dsize = 0; | ||
| 64 | } | ||
| 65 | |||
| 66 | data = *total_data++; | ||
| 67 | |||
| 68 | data <<= (max_data_bits - dsize); | ||
| 69 | while (dsize > 0) | ||
| 70 | { | ||
| 71 | if (load_size == max_data_bits) | ||
| 72 | { | ||
| 73 | *(outbase + (*outptr)++) = load; | ||
| 74 | load_size = 0; | ||
| 75 | load = 0x00; | ||
| 76 | } | ||
| 77 | load <<= 1; | ||
| 78 | load |= (data >> (max_data_bits - 1)); | ||
| 79 | data <<= 1; | ||
| 80 | load_size++; | ||
| 81 | total_bits++; | ||
| 82 | dsize--; | ||
| 83 | } | ||
| 84 | } | ||
| 85 | |||
| 86 | gLoad = load; | ||
| 87 | gLoadSize = load_size; | ||
| 88 | gTotalBits = total_bits; | ||
| 89 | } | ||
| 90 | #endif | ||
| 91 | |||
| 92 | ///////////////////////////////////////////////////////////////////////////////////////// | ||
| 93 | |||
| 94 | void bit_pack_reset() | ||
| 95 | { | ||
| 96 | gLoad = 0x0; | ||
| 97 | gLoadSize = 0; | ||
| 98 | gTotalBits = 0; | ||
| 99 | } | ||
| 100 | |||
| 101 | ///////////////////////////////////////////////////////////////////////////////////////// | ||
| 102 | |||
| 103 | void bit_pack_flush(U8 *outbase, U32 *outptr) | ||
| 104 | { | ||
| 105 | if (gLoadSize) | ||
| 106 | { | ||
| 107 | gTotalBits += gLoadSize; | ||
| 108 | gLoad <<= (gMaxDataBits - gLoadSize); | ||
| 109 | outbase[(*outptr)++] = gLoad; | ||
| 110 | gLoadSize = 0; | ||
| 111 | } | ||
| 112 | } | ||
| 113 | |||
| 114 | //////////////////////////////////////////////////////////////////////////////////////// | ||
| 115 | #if 0 | ||
| 116 | void bit_unpack(U8 *total_retval, U32 total_dsize, U8 *indata, U32 *inptr) | ||
| 117 | { | ||
| 118 | U32 max_data_bits = gMaxDataBits; | ||
| 119 | U32 unload_size = gUnLoadSize; | ||
| 120 | U32 dsize; | ||
| 121 | U8 *retval; | ||
| 122 | U8 unload = gUnLoad; | ||
| 123 | |||
| 124 | while (total_dsize > 0) | ||
| 125 | { | ||
| 126 | if (total_dsize > max_data_bits) | ||
| 127 | { | ||
| 128 | dsize = max_data_bits; | ||
| 129 | total_dsize -= max_data_bits; | ||
| 130 | } | ||
| 131 | else | ||
| 132 | { | ||
| 133 | dsize = total_dsize; | ||
| 134 | total_dsize = 0; | ||
| 135 | } | ||
| 136 | |||
| 137 | retval = total_data++; | ||
| 138 | *retval = 0x00; | ||
| 139 | while (dsize > 0) | ||
| 140 | { | ||
| 141 | if (unload_size == 0) | ||
| 142 | { | ||
| 143 | unload = indata[(*inptr)++]; | ||
| 144 | unload_size = max_data_bits; | ||
| 145 | } | ||
| 146 | *retval <<= 1; | ||
| 147 | *retval |= (unload >> (max_data_bits - 1)); | ||
| 148 | unload_size--; | ||
| 149 | unload <<= 1; | ||
| 150 | dsize--; | ||
| 151 | } | ||
| 152 | } | ||
| 153 | |||
| 154 | gUnLoad = unload; | ||
| 155 | gUnLoadSize = unload_size; | ||
| 156 | } | ||
| 157 | #endif | ||
| 158 | |||
| 159 | |||
| 160 | /////////////////////////////////////////////////////////////////////////////////////// | ||
| 161 | |||
| 162 | void bit_unpack_reset() | ||
| 163 | { | ||
| 164 | gUnLoad = 0; | ||
| 165 | gUnLoadSize = 0; | ||
| 166 | } | ||
| 167 | #endif | ||
diff --git a/linden/indra/llcommon/bitpack.h b/linden/indra/llcommon/bitpack.h index 9a32a07..89af101 100644 --- a/linden/indra/llcommon/bitpack.h +++ b/linden/indra/llcommon/bitpack.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/ctype_workaround.h b/linden/indra/llcommon/ctype_workaround.h index 08c44b1..20dd6c6 100644 --- a/linden/indra/llcommon/ctype_workaround.h +++ b/linden/indra/llcommon/ctype_workaround.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/doublelinkedlist.h b/linden/indra/llcommon/doublelinkedlist.h index 833e73c..81891b3 100644 --- a/linden/indra/llcommon/doublelinkedlist.h +++ b/linden/indra/llcommon/doublelinkedlist.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst index 5fcb8c7..6a48752 100644 --- a/linden/indra/llcommon/files.lst +++ b/linden/indra/llcommon/files.lst | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | llcommon/bitpack.cpp | ||
| 2 | llcommon/llapp.cpp | 1 | llcommon/llapp.cpp |
| 3 | llcommon/llapr.cpp | 2 | llcommon/llapr.cpp |
| 4 | llcommon/llassettype.cpp | 3 | llcommon/llassettype.cpp |
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h index d65b374..5c6ff08 100644 --- a/linden/indra/llcommon/imageids.h +++ b/linden/indra/llcommon/imageids.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h index deb9c9d..9024b12 100644 --- a/linden/indra/llcommon/indra_constants.h +++ b/linden/indra/llcommon/indra_constants.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -31,10 +32,6 @@ | |||
| 31 | #include "stdtypes.h" | 32 | #include "stdtypes.h" |
| 32 | #include "lluuid.h" | 33 | #include "lluuid.h" |
| 33 | 34 | ||
| 34 | // Viewer object cache version, change if object update | ||
| 35 | // format changes. JC | ||
| 36 | const U32 INDRA_OBJECT_CACHE_VERSION = 11; | ||
| 37 | |||
| 38 | // At 45 Hz collisions seem stable and objects seem | 35 | // At 45 Hz collisions seem stable and objects seem |
| 39 | // to settle down at a reasonable rate. | 36 | // to settle down at a reasonable rate. |
| 40 | // JC 3/18/2003 | 37 | // JC 3/18/2003 |
| @@ -116,11 +113,11 @@ const U32 DEFAULT_USER_SERVER_PORT = 12036; | |||
| 116 | const U32 DEFAULT_RPC_SERVER_PORT = 12037; | 113 | const U32 DEFAULT_RPC_SERVER_PORT = 12037; |
| 117 | const U32 DEFAULT_LOG_DATA_SERVER_PORT = 12039; | 114 | const U32 DEFAULT_LOG_DATA_SERVER_PORT = 12039; |
| 118 | const U32 DEFAULT_BACKBONE_PORT = 12040; | 115 | const U32 DEFAULT_BACKBONE_PORT = 12040; |
| 119 | const U32 DEFAULT_CGI_SERVICES_PORT = 12045; | ||
| 120 | const U32 DEFAULT_LOCAL_ASSET_PORT = 12041; | 116 | const U32 DEFAULT_LOCAL_ASSET_PORT = 12041; |
| 121 | //const U32 DEFAULT_BACKBONE_CAP_PORT = 12042; // Deprecated | 117 | //const U32 DEFAULT_BACKBONE_CAP_PORT = 12042; // Deprecated |
| 122 | const U32 DEFAULT_CAP_PROXY_PORT = 12043; | 118 | const U32 DEFAULT_CAP_PROXY_PORT = 12043; |
| 123 | const U32 DEFAULT_INV_DATA_SERVER_PORT = 12044; | 119 | const U32 DEFAULT_INV_DATA_SERVER_PORT = 12044; |
| 120 | const U32 DEFAULT_CGI_SERVICES_PORT = 12045; | ||
| 124 | 121 | ||
| 125 | // For automatic port discovery when running multiple viewers on one host | 122 | // For automatic port discovery when running multiple viewers on one host |
| 126 | const U32 PORT_DISCOVERY_RANGE_MIN = 13000; | 123 | const U32 PORT_DISCOVERY_RANGE_MIN = 13000; |
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h index b1c5f3b..5a6018a 100644 --- a/linden/indra/llcommon/linden_common.h +++ b/linden/indra/llcommon/linden_common.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/linked_lists.h b/linden/indra/llcommon/linked_lists.h index 4a1b163..ab4a622 100644 --- a/linden/indra/llcommon/linked_lists.h +++ b/linden/indra/llcommon/linked_lists.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h index fe51688..0e0fdb0 100644 --- a/linden/indra/llcommon/llagentconstants.h +++ b/linden/indra/llcommon/llagentconstants.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp index f48ff8f..5edcb3c 100644 --- a/linden/indra/llcommon/llapp.cpp +++ b/linden/indra/llcommon/llapp.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llapp.h b/linden/indra/llcommon/llapp.h index aef5cde..599bd48 100644 --- a/linden/indra/llcommon/llapp.h +++ b/linden/indra/llcommon/llapp.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp index 550a8d8..ee63497 100644 --- a/linden/indra/llcommon/llapr.cpp +++ b/linden/indra/llcommon/llapr.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2004-2007, Linden Research, Inc. | 7 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h index be6fc6c..a36b177 100644 --- a/linden/indra/llcommon/llapr.h +++ b/linden/indra/llcommon/llapr.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2004-2007, Linden Research, Inc. | 7 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp index df00af8..0bbef8c 100644 --- a/linden/indra/llcommon/llassettype.cpp +++ b/linden/indra/llcommon/llassettype.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h index da4cf0b..5fe6b16 100644 --- a/linden/indra/llcommon/llassettype.h +++ b/linden/indra/llcommon/llassettype.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llassoclist.h b/linden/indra/llcommon/llassoclist.h index d1d3eb8..417e347 100644 --- a/linden/indra/llcommon/llassoclist.h +++ b/linden/indra/llcommon/llassoclist.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h index 1eb5b05..3eedf4e 100644 --- a/linden/indra/llcommon/llavatarconstants.h +++ b/linden/indra/llcommon/llavatarconstants.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llbase32.h b/linden/indra/llcommon/llbase32.h index eaf3efc..198c5c6 100644 --- a/linden/indra/llcommon/llbase32.h +++ b/linden/indra/llcommon/llbase32.h | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * @file llbase32.h | 2 | * @file llbase32.h |
| 3 | * @brief base32 encoding that returns a std::string | 3 | * @brief base32 encoding that returns a std::string |
| 4 | * @author James Cook | 4 | * @author James Cook |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -23,16 +24,16 @@ | |||
| 23 | * | 24 | * |
| 24 | * 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 |
| 25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 26 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
| 26 | * COMPLETENESS OR PERFORMANCE. | 27 | * COMPLETENESS OR PERFORMANCE. |
| 27 | */ | 28 | */ |
| 28 | 29 | ||
| 29 | #ifndef LLBASE32_H | 30 | #ifndef LLBASE32_H |
| 30 | #define LLBASE32_h | 31 | #define LLBASE32_h |
| 31 | 32 | ||
| 32 | class LLBase32 | 33 | class LLBase32 |
| 33 | { | 34 | { |
| 34 | public: | 35 | public: |
| 35 | static std::string encode(const U8* input, size_t input_size); | 36 | static std::string encode(const U8* input, size_t input_size); |
| 36 | }; | 37 | }; |
| 37 | 38 | ||
| 38 | #endif | 39 | #endif |
diff --git a/linden/indra/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp index 0869d3f..18aefea 100644 --- a/linden/indra/llcommon/llbase64.cpp +++ b/linden/indra/llcommon/llbase64.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llbase64.h b/linden/indra/llcommon/llbase64.h index d8b4acc..995ac04 100644 --- a/linden/indra/llcommon/llbase64.h +++ b/linden/indra/llcommon/llbase64.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llboost.h b/linden/indra/llcommon/llboost.h index e572f6e..45d5eb2 100644 --- a/linden/indra/llcommon/llboost.h +++ b/linden/indra/llcommon/llboost.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h index aee9008..b1635a7 100644 --- a/linden/indra/llcommon/llchat.h +++ b/linden/indra/llcommon/llchat.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llclickaction.h b/linden/indra/llcommon/llclickaction.h index 03b8b85..e45ad90 100644 --- a/linden/indra/llcommon/llclickaction.h +++ b/linden/indra/llcommon/llclickaction.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp index 49675e1..993da7d 100644 --- a/linden/indra/llcommon/llcommon.cpp +++ b/linden/indra/llcommon/llcommon.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h index 8b57579..443870e 100644 --- a/linden/indra/llcommon/llcommon.h +++ b/linden/indra/llcommon/llcommon.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj index 403b8c5..ca91e18 100644 --- a/linden/indra/llcommon/llcommon.vcproj +++ b/linden/indra/llcommon/llcommon.vcproj | |||
| @@ -155,9 +155,6 @@ | |||
| 155 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 155 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
| 156 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> | 156 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> |
| 157 | <File | 157 | <File |
| 158 | RelativePath=".\bitpack.cpp"> | ||
| 159 | </File> | ||
| 160 | <File | ||
| 161 | RelativePath=".\llapp.cpp"> | 158 | RelativePath=".\llapp.cpp"> |
| 162 | </File> | 159 | </File> |
| 163 | <File | 160 | <File |
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj index 4fee443..0a34543 100644 --- a/linden/indra/llcommon/llcommon_vc8.vcproj +++ b/linden/indra/llcommon/llcommon_vc8.vcproj | |||
| @@ -1,759 +1,759 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8.00" | 4 | Version="8.00" |
| 5 | Name="llcommon" | 5 | Name="llcommon" |
| 6 | ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}" | 6 | ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}" |
| 7 | RootNamespace="llcommon" | 7 | RootNamespace="llcommon" |
| 8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
| 9 | > | 9 | > |
| 10 | <Platforms> | 10 | <Platforms> |
| 11 | <Platform | 11 | <Platform |
| 12 | Name="Win32" | 12 | Name="Win32" |
| 13 | /> | 13 | /> |
| 14 | </Platforms> | 14 | </Platforms> |
| 15 | <ToolFiles> | 15 | <ToolFiles> |
| 16 | </ToolFiles> | 16 | </ToolFiles> |
| 17 | <Configurations> | 17 | <Configurations> |
| 18 | <Configuration | 18 | <Configuration |
| 19 | Name="Debug|Win32" | 19 | Name="Debug|Win32" |
| 20 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 20 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
| 21 | IntermediateDirectory="$(ConfigurationName)" | 21 | IntermediateDirectory="$(ConfigurationName)" |
| 22 | ConfigurationType="4" | 22 | ConfigurationType="4" |
| 23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
| 24 | CharacterSet="1" | 24 | CharacterSet="1" |
| 25 | > | 25 | > |
| 26 | <Tool | 26 | <Tool |
| 27 | Name="VCPreBuildEventTool" | 27 | Name="VCPreBuildEventTool" |
| 28 | /> | 28 | /> |
| 29 | <Tool | 29 | <Tool |
| 30 | Name="VCCustomBuildTool" | 30 | Name="VCCustomBuildTool" |
| 31 | /> | 31 | /> |
| 32 | <Tool | 32 | <Tool |
| 33 | Name="VCXMLDataGeneratorTool" | 33 | Name="VCXMLDataGeneratorTool" |
| 34 | /> | 34 | /> |
| 35 | <Tool | 35 | <Tool |
| 36 | Name="VCWebServiceProxyGeneratorTool" | 36 | Name="VCWebServiceProxyGeneratorTool" |
| 37 | /> | 37 | /> |
| 38 | <Tool | 38 | <Tool |
| 39 | Name="VCMIDLTool" | 39 | Name="VCMIDLTool" |
| 40 | /> | 40 | /> |
| 41 | <Tool | 41 | <Tool |
| 42 | Name="VCCLCompilerTool" | 42 | Name="VCCLCompilerTool" |
| 43 | Optimization="0" | 43 | Optimization="0" |
| 44 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" | 44 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" |
| 45 | 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" | 45 | 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" |
| 46 | MinimalRebuild="true" | 46 | MinimalRebuild="true" |
| 47 | BasicRuntimeChecks="3" | 47 | BasicRuntimeChecks="3" |
| 48 | RuntimeLibrary="1" | 48 | RuntimeLibrary="1" |
| 49 | StructMemberAlignment="4" | 49 | StructMemberAlignment="4" |
| 50 | TreatWChar_tAsBuiltInType="false" | 50 | TreatWChar_tAsBuiltInType="false" |
| 51 | ForceConformanceInForLoopScope="true" | 51 | ForceConformanceInForLoopScope="true" |
| 52 | UsePrecompiledHeader="0" | 52 | UsePrecompiledHeader="0" |
| 53 | WarningLevel="3" | 53 | WarningLevel="3" |
| 54 | WarnAsError="true" | 54 | WarnAsError="true" |
| 55 | Detect64BitPortabilityProblems="false" | 55 | Detect64BitPortabilityProblems="false" |
| 56 | DebugInformationFormat="4" | 56 | DebugInformationFormat="4" |
| 57 | /> | 57 | /> |
| 58 | <Tool | 58 | <Tool |
| 59 | Name="VCManagedResourceCompilerTool" | 59 | Name="VCManagedResourceCompilerTool" |
| 60 | /> | 60 | /> |
| 61 | <Tool | 61 | <Tool |
| 62 | Name="VCResourceCompilerTool" | 62 | Name="VCResourceCompilerTool" |
| 63 | /> | 63 | /> |
| 64 | <Tool | 64 | <Tool |
| 65 | Name="VCPreLinkEventTool" | 65 | Name="VCPreLinkEventTool" |
| 66 | /> | 66 | /> |
| 67 | <Tool | 67 | <Tool |
| 68 | Name="VCLibrarianTool" | 68 | Name="VCLibrarianTool" |
| 69 | OutputFile="$(OutDir)/llcommon.lib" | 69 | OutputFile="$(OutDir)/llcommon.lib" |
| 70 | /> | 70 | /> |
| 71 | <Tool | 71 | <Tool |
| 72 | Name="VCALinkTool" | 72 | Name="VCALinkTool" |
| 73 | /> | 73 | /> |
| 74 | <Tool | 74 | <Tool |
| 75 | Name="VCXDCMakeTool" | 75 | Name="VCXDCMakeTool" |
| 76 | /> | 76 | /> |
| 77 | <Tool | 77 | <Tool |
| 78 | Name="VCBscMakeTool" | 78 | Name="VCBscMakeTool" |
| 79 | /> | 79 | /> |
| 80 | <Tool | 80 | <Tool |
| 81 | Name="VCFxCopTool" | 81 | Name="VCFxCopTool" |
| 82 | /> | 82 | /> |
| 83 | <Tool | 83 | <Tool |
| 84 | Name="VCPostBuildEventTool" | 84 | Name="VCPostBuildEventTool" |
| 85 | /> | 85 | /> |
| 86 | </Configuration> | 86 | </Configuration> |
| 87 | <Configuration | 87 | <Configuration |
| 88 | Name="Release|Win32" | 88 | Name="Release|Win32" |
| 89 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 89 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
| 90 | IntermediateDirectory="$(ConfigurationName)" | 90 | IntermediateDirectory="$(ConfigurationName)" |
| 91 | ConfigurationType="4" | 91 | ConfigurationType="4" |
| 92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
| 93 | CharacterSet="1" | 93 | CharacterSet="1" |
| 94 | > | 94 | > |
| 95 | <Tool | 95 | <Tool |
| 96 | Name="VCPreBuildEventTool" | 96 | Name="VCPreBuildEventTool" |
| 97 | /> | 97 | /> |
| 98 | <Tool | 98 | <Tool |
| 99 | Name="VCCustomBuildTool" | 99 | Name="VCCustomBuildTool" |
| 100 | /> | 100 | /> |
| 101 | <Tool | 101 | <Tool |
| 102 | Name="VCXMLDataGeneratorTool" | 102 | Name="VCXMLDataGeneratorTool" |
| 103 | /> | 103 | /> |
| 104 | <Tool | 104 | <Tool |
| 105 | Name="VCWebServiceProxyGeneratorTool" | 105 | Name="VCWebServiceProxyGeneratorTool" |
| 106 | /> | 106 | /> |
| 107 | <Tool | 107 | <Tool |
| 108 | Name="VCMIDLTool" | 108 | Name="VCMIDLTool" |
| 109 | /> | 109 | /> |
| 110 | <Tool | 110 | <Tool |
| 111 | Name="VCCLCompilerTool" | 111 | Name="VCCLCompilerTool" |
| 112 | InlineFunctionExpansion="2" | 112 | InlineFunctionExpansion="2" |
| 113 | EnableIntrinsicFunctions="true" | 113 | EnableIntrinsicFunctions="true" |
| 114 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" | 114 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" |
| 115 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC" | 115 | 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" |
| 116 | RuntimeLibrary="0" | 116 | RuntimeLibrary="0" |
| 117 | StructMemberAlignment="0" | 117 | StructMemberAlignment="0" |
| 118 | TreatWChar_tAsBuiltInType="false" | 118 | TreatWChar_tAsBuiltInType="false" |
| 119 | ForceConformanceInForLoopScope="true" | 119 | ForceConformanceInForLoopScope="true" |
| 120 | UsePrecompiledHeader="0" | 120 | UsePrecompiledHeader="0" |
| 121 | WarningLevel="3" | 121 | WarningLevel="3" |
| 122 | WarnAsError="true" | 122 | WarnAsError="true" |
| 123 | Detect64BitPortabilityProblems="false" | 123 | Detect64BitPortabilityProblems="false" |
| 124 | DebugInformationFormat="3" | 124 | DebugInformationFormat="3" |
| 125 | /> | 125 | /> |
| 126 | <Tool | 126 | <Tool |
| 127 | Name="VCManagedResourceCompilerTool" | 127 | Name="VCManagedResourceCompilerTool" |
| 128 | /> | 128 | /> |
| 129 | <Tool | 129 | <Tool |
| 130 | Name="VCResourceCompilerTool" | 130 | Name="VCResourceCompilerTool" |
| 131 | /> | 131 | /> |
| 132 | <Tool | 132 | <Tool |
| 133 | Name="VCPreLinkEventTool" | 133 | Name="VCPreLinkEventTool" |
| 134 | /> | 134 | /> |
| 135 | <Tool | 135 | <Tool |
| 136 | Name="VCLibrarianTool" | 136 | Name="VCLibrarianTool" |
| 137 | OutputFile="$(OutDir)/llcommon.lib" | 137 | OutputFile="$(OutDir)/llcommon.lib" |
| 138 | /> | 138 | /> |
| 139 | <Tool | 139 | <Tool |
| 140 | Name="VCALinkTool" | 140 | Name="VCALinkTool" |
| 141 | /> | 141 | /> |
| 142 | <Tool | 142 | <Tool |
| 143 | Name="VCXDCMakeTool" | 143 | Name="VCXDCMakeTool" |
| 144 | /> | 144 | /> |
| 145 | <Tool | 145 | <Tool |
| 146 | Name="VCBscMakeTool" | 146 | Name="VCBscMakeTool" |
| 147 | /> | 147 | /> |
| 148 | <Tool | 148 | <Tool |
| 149 | Name="VCFxCopTool" | 149 | Name="VCFxCopTool" |
| 150 | /> | 150 | /> |
| 151 | <Tool | 151 | <Tool |
| 152 | Name="VCPostBuildEventTool" | 152 | Name="VCPostBuildEventTool" |
| 153 | /> | 153 | /> |
| 154 | </Configuration> | 154 | </Configuration> |
| 155 | <Configuration | 155 | <Configuration |
| 156 | Name="ReleaseNoOpt|Win32" | 156 | Name="ReleaseNoOpt|Win32" |
| 157 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 157 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
| 158 | IntermediateDirectory="$(ConfigurationName)" | 158 | IntermediateDirectory="$(ConfigurationName)" |
| 159 | ConfigurationType="4" | 159 | ConfigurationType="4" |
| 160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
| 161 | CharacterSet="1" | 161 | CharacterSet="1" |
| 162 | > | 162 | > |
| 163 | <Tool | 163 | <Tool |
| 164 | Name="VCPreBuildEventTool" | 164 | Name="VCPreBuildEventTool" |
| 165 | /> | 165 | /> |
| 166 | <Tool | 166 | <Tool |
| 167 | Name="VCCustomBuildTool" | 167 | Name="VCCustomBuildTool" |
| 168 | /> | 168 | /> |
| 169 | <Tool | 169 | <Tool |
| 170 | Name="VCXMLDataGeneratorTool" | 170 | Name="VCXMLDataGeneratorTool" |
| 171 | /> | 171 | /> |
| 172 | <Tool | 172 | <Tool |
| 173 | Name="VCWebServiceProxyGeneratorTool" | 173 | Name="VCWebServiceProxyGeneratorTool" |
| 174 | /> | 174 | /> |
| 175 | <Tool | 175 | <Tool |
| 176 | Name="VCMIDLTool" | 176 | Name="VCMIDLTool" |
| 177 | /> | 177 | /> |
| 178 | <Tool | 178 | <Tool |
| 179 | Name="VCCLCompilerTool" | 179 | Name="VCCLCompilerTool" |
| 180 | Optimization="0" | 180 | Optimization="0" |
| 181 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" | 181 | AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\" |
| 182 | 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" | 182 | 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" |
| 183 | RuntimeLibrary="0" | 183 | RuntimeLibrary="0" |
| 184 | StructMemberAlignment="0" | 184 | StructMemberAlignment="0" |
| 185 | TreatWChar_tAsBuiltInType="false" | 185 | TreatWChar_tAsBuiltInType="false" |
| 186 | ForceConformanceInForLoopScope="true" | 186 | ForceConformanceInForLoopScope="true" |
| 187 | UsePrecompiledHeader="0" | 187 | UsePrecompiledHeader="0" |
| 188 | WarningLevel="3" | 188 | WarningLevel="3" |
| 189 | WarnAsError="true" | 189 | WarnAsError="true" |
| 190 | Detect64BitPortabilityProblems="false" | 190 | Detect64BitPortabilityProblems="false" |
| 191 | DebugInformationFormat="3" | 191 | DebugInformationFormat="3" |
| 192 | /> | 192 | /> |
| 193 | <Tool | 193 | <Tool |
| 194 | Name="VCManagedResourceCompilerTool" | 194 | Name="VCManagedResourceCompilerTool" |
| 195 | /> | 195 | /> |
| 196 | <Tool | 196 | <Tool |
| 197 | Name="VCResourceCompilerTool" | 197 | Name="VCResourceCompilerTool" |
| 198 | /> | 198 | /> |
| 199 | <Tool | 199 | <Tool |
| 200 | Name="VCPreLinkEventTool" | 200 | Name="VCPreLinkEventTool" |
| 201 | /> | 201 | /> |
| 202 | <Tool | 202 | <Tool |
| 203 | Name="VCLibrarianTool" | 203 | Name="VCLibrarianTool" |
| 204 | OutputFile="$(OutDir)/llcommon.lib" | 204 | OutputFile="$(OutDir)/llcommon.lib" |
| 205 | /> | 205 | /> |
| 206 | <Tool | 206 | <Tool |
| 207 | Name="VCALinkTool" | 207 | Name="VCALinkTool" |
| 208 | /> | 208 | /> |
| 209 | <Tool | 209 | <Tool |
| 210 | Name="VCXDCMakeTool" | 210 | Name="VCXDCMakeTool" |
| 211 | /> | 211 | /> |
| 212 | <Tool | 212 | <Tool |
| 213 | Name="VCBscMakeTool" | 213 | Name="VCBscMakeTool" |
| 214 | /> | 214 | /> |
| 215 | <Tool | 215 | <Tool |
| 216 | Name="VCFxCopTool" | 216 | Name="VCFxCopTool" |
| 217 | /> | 217 | /> |
| 218 | <Tool | 218 | <Tool |
| 219 | Name="VCPostBuildEventTool" | 219 | Name="VCPostBuildEventTool" |
| 220 | /> | 220 | /> |
| 221 | </Configuration> | 221 | </Configuration> |
| 222 | </Configurations> | 222 | </Configurations> |
| 223 | <References> | 223 | <References> |
| 224 | </References> | 224 | </References> |
| 225 | <Files> | 225 | <Files> |
| 226 | <Filter | 226 | <Filter |
| 227 | Name="Source Files" | 227 | Name="Source Files" |
| 228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
| 229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | 229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" |
| 230 | > | 230 | > |
| 231 | <File | 231 | <File |
| 232 | RelativePath=".\bitpack.cpp" | 232 | RelativePath=".\bitpack.cpp" |
| 233 | > | 233 | > |
| 234 | </File> | 234 | </File> |
| 235 | <File | 235 | <File |
| 236 | RelativePath=".\llapp.cpp" | 236 | RelativePath=".\llapp.cpp" |
| 237 | > | 237 | > |
| 238 | </File> | 238 | </File> |
| 239 | <File | 239 | <File |
| 240 | RelativePath=".\llapr.cpp" | 240 | RelativePath=".\llapr.cpp" |
| 241 | > | 241 | > |
| 242 | </File> | 242 | </File> |
| 243 | <File | 243 | <File |
| 244 | RelativePath=".\llassettype.cpp" | 244 | RelativePath=".\llassettype.cpp" |
| 245 | > | 245 | > |
| 246 | </File> | 246 | </File> |
| 247 | <File | 247 | <File |
| 248 | RelativePath=".\llbase64.cpp" | 248 | RelativePath=".\llbase64.cpp" |
| 249 | > | 249 | > |
| 250 | </File> | 250 | </File> |
| 251 | <File | 251 | <File |
| 252 | RelativePath=".\llcommon.cpp" | 252 | RelativePath=".\llcommon.cpp" |
| 253 | > | 253 | > |
| 254 | </File> | 254 | </File> |
| 255 | <File | 255 | <File |
| 256 | RelativePath=".\llcriticaldamp.cpp" | 256 | RelativePath=".\llcriticaldamp.cpp" |
| 257 | > | 257 | > |
| 258 | </File> | 258 | </File> |
| 259 | <File | 259 | <File |
| 260 | RelativePath=".\lldate.cpp" | 260 | RelativePath=".\lldate.cpp" |
| 261 | > | 261 | > |
| 262 | </File> | 262 | </File> |
| 263 | <File | 263 | <File |
| 264 | RelativePath=".\llerror.cpp" | 264 | RelativePath=".\llerror.cpp" |
| 265 | > | 265 | > |
| 266 | </File> | 266 | </File> |
| 267 | <File | 267 | <File |
| 268 | RelativePath=".\llerrorthread.cpp" | 268 | RelativePath=".\llerrorthread.cpp" |
| 269 | > | 269 | > |
| 270 | </File> | 270 | </File> |
| 271 | <File | 271 | <File |
| 272 | RelativePath=".\llevent.cpp" | 272 | RelativePath=".\llevent.cpp" |
| 273 | > | 273 | > |
| 274 | </File> | 274 | </File> |
| 275 | <File | 275 | <File |
| 276 | RelativePath=".\llfasttimer.cpp" | 276 | RelativePath=".\llfasttimer.cpp" |
| 277 | > | 277 | > |
| 278 | </File> | 278 | </File> |
| 279 | <File | 279 | <File |
| 280 | RelativePath=".\llfile.cpp" | 280 | RelativePath=".\llfile.cpp" |
| 281 | > | 281 | > |
| 282 | </File> | 282 | </File> |
| 283 | <File | 283 | <File |
| 284 | RelativePath=".\llfixedbuffer.cpp" | 284 | RelativePath=".\llfixedbuffer.cpp" |
| 285 | > | 285 | > |
| 286 | </File> | 286 | </File> |
| 287 | <File | 287 | <File |
| 288 | RelativePath=".\llformat.cpp" | 288 | RelativePath=".\llformat.cpp" |
| 289 | > | 289 | > |
| 290 | </File> | 290 | </File> |
| 291 | <File | 291 | <File |
| 292 | RelativePath=".\llframetimer.cpp" | 292 | RelativePath=".\llframetimer.cpp" |
| 293 | > | 293 | > |
| 294 | </File> | 294 | </File> |
| 295 | <File | 295 | <File |
| 296 | RelativePath=".\lllivefile.cpp" | 296 | RelativePath=".\lllivefile.cpp" |
| 297 | > | 297 | > |
| 298 | </File> | 298 | </File> |
| 299 | <File | 299 | <File |
| 300 | RelativePath=".\llmemory.cpp" | 300 | RelativePath=".\llmemory.cpp" |
| 301 | > | 301 | > |
| 302 | </File> | 302 | </File> |
| 303 | <File | 303 | <File |
| 304 | RelativePath=".\llmemorystream.cpp" | 304 | RelativePath=".\llmemorystream.cpp" |
| 305 | > | 305 | > |
| 306 | </File> | 306 | </File> |
| 307 | <File | 307 | <File |
| 308 | RelativePath=".\llmortician.cpp" | 308 | RelativePath=".\llmortician.cpp" |
| 309 | > | 309 | > |
| 310 | </File> | 310 | </File> |
| 311 | <File | 311 | <File |
| 312 | RelativePath=".\llprocessor.cpp" | 312 | RelativePath=".\llprocessor.cpp" |
| 313 | > | 313 | > |
| 314 | </File> | 314 | </File> |
| 315 | <File | 315 | <File |
| 316 | RelativePath=".\llqueuedthread.cpp" | 316 | RelativePath=".\llqueuedthread.cpp" |
| 317 | > | 317 | > |
| 318 | </File> | 318 | </File> |
| 319 | <File | 319 | <File |
| 320 | RelativePath=".\llrun.cpp" | 320 | RelativePath=".\llrun.cpp" |
| 321 | > | 321 | > |
| 322 | </File> | 322 | </File> |
| 323 | <File | 323 | <File |
| 324 | RelativePath=".\llsd.cpp" | 324 | RelativePath=".\llsd.cpp" |
| 325 | > | 325 | > |
| 326 | </File> | 326 | </File> |
| 327 | <File | 327 | <File |
| 328 | RelativePath=".\llsdserialize.cpp" | 328 | RelativePath=".\llsdserialize.cpp" |
| 329 | > | 329 | > |
| 330 | </File> | 330 | </File> |
| 331 | <File | 331 | <File |
| 332 | RelativePath=".\llsdserialize_xml.cpp" | 332 | RelativePath=".\llsdserialize_xml.cpp" |
| 333 | > | 333 | > |
| 334 | </File> | 334 | </File> |
| 335 | <File | 335 | <File |
| 336 | RelativePath=".\llsdutil.cpp" | 336 | RelativePath=".\llsdutil.cpp" |
| 337 | > | 337 | > |
| 338 | </File> | 338 | </File> |
| 339 | <File | 339 | <File |
| 340 | RelativePath=".\llsecondlifeurls.cpp" | 340 | RelativePath=".\llsecondlifeurls.cpp" |
| 341 | > | 341 | > |
| 342 | </File> | 342 | </File> |
| 343 | <File | 343 | <File |
| 344 | RelativePath=".\llstat.cpp" | 344 | RelativePath=".\llstat.cpp" |
| 345 | > | 345 | > |
| 346 | </File> | 346 | </File> |
| 347 | <File | 347 | <File |
| 348 | RelativePath=".\llstreamtools.cpp" | 348 | RelativePath=".\llstreamtools.cpp" |
| 349 | > | 349 | > |
| 350 | </File> | 350 | </File> |
| 351 | <File | 351 | <File |
| 352 | RelativePath=".\llstring.cpp" | 352 | RelativePath=".\llstring.cpp" |
| 353 | > | 353 | > |
| 354 | </File> | 354 | </File> |
| 355 | <File | 355 | <File |
| 356 | RelativePath=".\llstringtable.cpp" | 356 | RelativePath=".\llstringtable.cpp" |
| 357 | > | 357 | > |
| 358 | </File> | 358 | </File> |
| 359 | <File | 359 | <File |
| 360 | RelativePath=".\llsys.cpp" | 360 | RelativePath=".\llsys.cpp" |
| 361 | > | 361 | > |
| 362 | </File> | 362 | </File> |
| 363 | <File | 363 | <File |
| 364 | RelativePath=".\llthread.cpp" | 364 | RelativePath=".\llthread.cpp" |
| 365 | > | 365 | > |
| 366 | </File> | 366 | </File> |
| 367 | <File | 367 | <File |
| 368 | RelativePath=".\lltimer.cpp" | 368 | RelativePath=".\lltimer.cpp" |
| 369 | > | 369 | > |
| 370 | </File> | 370 | </File> |
| 371 | <File | 371 | <File |
| 372 | RelativePath=".\lluri.cpp" | 372 | RelativePath=".\lluri.cpp" |
| 373 | > | 373 | > |
| 374 | </File> | 374 | </File> |
| 375 | <File | 375 | <File |
| 376 | RelativePath=".\llworkerthread.cpp" | 376 | RelativePath=".\llworkerthread.cpp" |
| 377 | > | 377 | > |
| 378 | </File> | 378 | </File> |
| 379 | <File | 379 | <File |
| 380 | RelativePath=".\metaclass.cpp" | 380 | RelativePath=".\metaclass.cpp" |
| 381 | > | 381 | > |
| 382 | </File> | 382 | </File> |
| 383 | <File | 383 | <File |
| 384 | RelativePath=".\metaproperty.cpp" | 384 | RelativePath=".\metaproperty.cpp" |
| 385 | > | 385 | > |
| 386 | </File> | 386 | </File> |
| 387 | <File | 387 | <File |
| 388 | RelativePath=".\reflective.cpp" | 388 | RelativePath=".\reflective.cpp" |
| 389 | > | 389 | > |
| 390 | </File> | 390 | </File> |
| 391 | <File | 391 | <File |
| 392 | RelativePath=".\timing.cpp" | 392 | RelativePath=".\timing.cpp" |
| 393 | > | 393 | > |
| 394 | </File> | 394 | </File> |
| 395 | <File | 395 | <File |
| 396 | RelativePath=".\u64.cpp" | 396 | RelativePath=".\u64.cpp" |
| 397 | > | 397 | > |
| 398 | </File> | 398 | </File> |
| 399 | </Filter> | 399 | </Filter> |
| 400 | <Filter | 400 | <Filter |
| 401 | Name="Header Files" | 401 | Name="Header Files" |
| 402 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | 402 | Filter="h;hpp;hxx;hm;inl;inc;xsd" |
| 403 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | 403 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" |
| 404 | > | 404 | > |
| 405 | <File | 405 | <File |
| 406 | RelativePath=".\bitpack.h" | 406 | RelativePath=".\bitpack.h" |
| 407 | > | 407 | > |
| 408 | </File> | 408 | </File> |
| 409 | <File | 409 | <File |
| 410 | RelativePath=".\doublelinkedlist.h" | 410 | RelativePath=".\doublelinkedlist.h" |
| 411 | > | 411 | > |
| 412 | </File> | 412 | </File> |
| 413 | <File | 413 | <File |
| 414 | RelativePath=".\imageids.h" | 414 | RelativePath=".\imageids.h" |
| 415 | > | 415 | > |
| 416 | </File> | 416 | </File> |
| 417 | <File | 417 | <File |
| 418 | RelativePath=".\indra_constants.h" | 418 | RelativePath=".\indra_constants.h" |
| 419 | > | 419 | > |
| 420 | </File> | 420 | </File> |
| 421 | <File | 421 | <File |
| 422 | RelativePath=".\linden_common.h" | 422 | RelativePath=".\linden_common.h" |
| 423 | > | 423 | > |
| 424 | </File> | 424 | </File> |
| 425 | <File | 425 | <File |
| 426 | RelativePath=".\linked_lists.h" | 426 | RelativePath=".\linked_lists.h" |
| 427 | > | 427 | > |
| 428 | </File> | 428 | </File> |
| 429 | <File | 429 | <File |
| 430 | RelativePath=".\llagentconstants.h" | 430 | RelativePath=".\llagentconstants.h" |
| 431 | > | 431 | > |
| 432 | </File> | 432 | </File> |
| 433 | <File | 433 | <File |
| 434 | RelativePath=".\llapp.h" | 434 | RelativePath=".\llapp.h" |
| 435 | > | 435 | > |
| 436 | </File> | 436 | </File> |
| 437 | <File | 437 | <File |
| 438 | RelativePath=".\llapr.h" | 438 | RelativePath=".\llapr.h" |
| 439 | > | 439 | > |
| 440 | </File> | 440 | </File> |
| 441 | <File | 441 | <File |
| 442 | RelativePath=".\llassettype.h" | 442 | RelativePath=".\llassettype.h" |
| 443 | > | 443 | > |
| 444 | </File> | 444 | </File> |
| 445 | <File | 445 | <File |
| 446 | RelativePath=".\llassoclist.h" | 446 | RelativePath=".\llassoclist.h" |
| 447 | > | 447 | > |
| 448 | </File> | 448 | </File> |
| 449 | <File | 449 | <File |
| 450 | RelativePath=".\llavatarconstants.h" | 450 | RelativePath=".\llavatarconstants.h" |
| 451 | > | 451 | > |
| 452 | </File> | 452 | </File> |
| 453 | <File | 453 | <File |
| 454 | RelativePath=".\llbase64.h" | 454 | RelativePath=".\llbase64.h" |
| 455 | > | 455 | > |
| 456 | </File> | 456 | </File> |
| 457 | <File | 457 | <File |
| 458 | RelativePath=".\llboost.h" | 458 | RelativePath=".\llboost.h" |
| 459 | > | 459 | > |
| 460 | </File> | 460 | </File> |
| 461 | <File | 461 | <File |
| 462 | RelativePath=".\llchat.h" | 462 | RelativePath=".\llchat.h" |
| 463 | > | 463 | > |
| 464 | </File> | 464 | </File> |
| 465 | <File | 465 | <File |
| 466 | RelativePath=".\llclickaction.h" | 466 | RelativePath=".\llclickaction.h" |
| 467 | > | 467 | > |
| 468 | </File> | 468 | </File> |
| 469 | <File | 469 | <File |
| 470 | RelativePath=".\llcommon.h" | 470 | RelativePath=".\llcommon.h" |
| 471 | > | 471 | > |
| 472 | </File> | 472 | </File> |
| 473 | <File | 473 | <File |
| 474 | RelativePath=".\llcriticaldamp.h" | 474 | RelativePath=".\llcriticaldamp.h" |
| 475 | > | 475 | > |
| 476 | </File> | 476 | </File> |
| 477 | <File | 477 | <File |
| 478 | RelativePath=".\lldarray.h" | 478 | RelativePath=".\lldarray.h" |
| 479 | > | 479 | > |
| 480 | </File> | 480 | </File> |
| 481 | <File | 481 | <File |
| 482 | RelativePath=".\lldarrayptr.h" | 482 | RelativePath=".\lldarrayptr.h" |
| 483 | > | 483 | > |
| 484 | </File> | 484 | </File> |
| 485 | <File | 485 | <File |
| 486 | RelativePath=".\lldate.h" | 486 | RelativePath=".\lldate.h" |
| 487 | > | 487 | > |
| 488 | </File> | 488 | </File> |
| 489 | <File | 489 | <File |
| 490 | RelativePath=".\lldefs.h" | 490 | RelativePath=".\lldefs.h" |
| 491 | > | 491 | > |
| 492 | </File> | 492 | </File> |
| 493 | <File | 493 | <File |
| 494 | RelativePath=".\lldlinked.h" | 494 | RelativePath=".\lldlinked.h" |
| 495 | > | 495 | > |
| 496 | </File> | 496 | </File> |
| 497 | <File | 497 | <File |
| 498 | RelativePath=".\lldqueueptr.h" | 498 | RelativePath=".\lldqueueptr.h" |
| 499 | > | 499 | > |
| 500 | </File> | 500 | </File> |
| 501 | <File | 501 | <File |
| 502 | RelativePath=".\llendianswizzle.h" | 502 | RelativePath=".\llendianswizzle.h" |
| 503 | > | 503 | > |
| 504 | </File> | 504 | </File> |
| 505 | <File | 505 | <File |
| 506 | RelativePath=".\llenum.h" | 506 | RelativePath=".\llenum.h" |
| 507 | > | 507 | > |
| 508 | </File> | 508 | </File> |
| 509 | <File | 509 | <File |
| 510 | RelativePath=".\llerror.h" | 510 | RelativePath=".\llerror.h" |
| 511 | > | 511 | > |
| 512 | </File> | 512 | </File> |
| 513 | <File | 513 | <File |
| 514 | RelativePath=".\llerrorcontrol.h" | 514 | RelativePath=".\llerrorcontrol.h" |
| 515 | > | 515 | > |
| 516 | </File> | 516 | </File> |
| 517 | <File | 517 | <File |
| 518 | RelativePath=".\llerrorthread.h" | 518 | RelativePath=".\llerrorthread.h" |
| 519 | > | 519 | > |
| 520 | </File> | 520 | </File> |
| 521 | <File | 521 | <File |
| 522 | RelativePath=".\llevent.h" | 522 | RelativePath=".\llevent.h" |
| 523 | > | 523 | > |
| 524 | </File> | 524 | </File> |
| 525 | <File | 525 | <File |
| 526 | RelativePath=".\llfasttimer.h" | 526 | RelativePath=".\llfasttimer.h" |
| 527 | > | 527 | > |
| 528 | </File> | 528 | </File> |
| 529 | <File | 529 | <File |
| 530 | RelativePath=".\llfile.h" | 530 | RelativePath=".\llfile.h" |
| 531 | > | 531 | > |
| 532 | </File> | 532 | </File> |
| 533 | <File | 533 | <File |
| 534 | RelativePath=".\llfixedbuffer.h" | 534 | RelativePath=".\llfixedbuffer.h" |
| 535 | > | 535 | > |
| 536 | </File> | 536 | </File> |
| 537 | <File | 537 | <File |
| 538 | RelativePath=".\llformat.h" | 538 | RelativePath=".\llformat.h" |
| 539 | > | 539 | > |
| 540 | </File> | 540 | </File> |
| 541 | <File | 541 | <File |
| 542 | RelativePath=".\llframecallbackmanager.h" | 542 | RelativePath=".\llframecallbackmanager.h" |
| 543 | > | 543 | > |
| 544 | </File> | 544 | </File> |
| 545 | <File | 545 | <File |
| 546 | RelativePath=".\llframetimer.h" | 546 | RelativePath=".\llframetimer.h" |
| 547 | > | 547 | > |
| 548 | </File> | 548 | </File> |
| 549 | <File | 549 | <File |
| 550 | RelativePath=".\llhash.h" | 550 | RelativePath=".\llhash.h" |
| 551 | > | 551 | > |
| 552 | </File> | 552 | </File> |
| 553 | <File | 553 | <File |
| 554 | RelativePath=".\llindexedqueue.h" | 554 | RelativePath=".\llindexedqueue.h" |
| 555 | > | 555 | > |
| 556 | </File> | 556 | </File> |
| 557 | <File | 557 | <File |
| 558 | RelativePath=".\lllinkedqueue.h" | 558 | RelativePath=".\lllinkedqueue.h" |
| 559 | > | 559 | > |
| 560 | </File> | 560 | </File> |
| 561 | <File | 561 | <File |
| 562 | RelativePath=".\lllivefile.h" | 562 | RelativePath=".\lllivefile.h" |
| 563 | > | 563 | > |
| 564 | </File> | 564 | </File> |
| 565 | <File | 565 | <File |
| 566 | RelativePath=".\lllocalidhashmap.h" | 566 | RelativePath=".\lllocalidhashmap.h" |
| 567 | > | 567 | > |
| 568 | </File> | 568 | </File> |
| 569 | <File | 569 | <File |
| 570 | RelativePath=".\lllslconstants.h" | 570 | RelativePath=".\lllslconstants.h" |
| 571 | > | 571 | > |
| 572 | </File> | 572 | </File> |
| 573 | <File | 573 | <File |
| 574 | RelativePath=".\llmap.h" | 574 | RelativePath=".\llmap.h" |
| 575 | > | 575 | > |
| 576 | </File> | 576 | </File> |
| 577 | <File | 577 | <File |
| 578 | RelativePath=".\llmemory.h" | 578 | RelativePath=".\llmemory.h" |
| 579 | > | 579 | > |
| 580 | </File> | 580 | </File> |
| 581 | <File | 581 | <File |
| 582 | RelativePath=".\llmemorystream.h" | 582 | RelativePath=".\llmemorystream.h" |
| 583 | > | 583 | > |
| 584 | </File> | 584 | </File> |
| 585 | <File | 585 | <File |
| 586 | RelativePath=".\llmortician.h" | 586 | RelativePath=".\llmortician.h" |
| 587 | > | 587 | > |
| 588 | </File> | 588 | </File> |
| 589 | <File | 589 | <File |
| 590 | RelativePath=".\llnametable.h" | 590 | RelativePath=".\llnametable.h" |
| 591 | > | 591 | > |
| 592 | </File> | 592 | </File> |
| 593 | <File | 593 | <File |
| 594 | RelativePath=".\llpagemem.h" | 594 | RelativePath=".\llpagemem.h" |
| 595 | > | 595 | > |
| 596 | </File> | 596 | </File> |
| 597 | <File | 597 | <File |
| 598 | RelativePath=".\llpreprocessor.h" | 598 | RelativePath=".\llpreprocessor.h" |
| 599 | > | 599 | > |
| 600 | </File> | 600 | </File> |
| 601 | <File | 601 | <File |
| 602 | RelativePath=".\llpriqueuemap.h" | 602 | RelativePath=".\llpriqueuemap.h" |
| 603 | > | 603 | > |
| 604 | </File> | 604 | </File> |
| 605 | <File | 605 | <File |
| 606 | RelativePath=".\llprocessor.h" | 606 | RelativePath=".\llprocessor.h" |
| 607 | > | 607 | > |
| 608 | </File> | 608 | </File> |
| 609 | <File | 609 | <File |
| 610 | RelativePath=".\llptrskiplist.h" | 610 | RelativePath=".\llptrskiplist.h" |
| 611 | > | 611 | > |
| 612 | </File> | 612 | </File> |
| 613 | <File | 613 | <File |
| 614 | RelativePath=".\llptrskipmap.h" | 614 | RelativePath=".\llptrskipmap.h" |
| 615 | > | 615 | > |
| 616 | </File> | 616 | </File> |
| 617 | <File | 617 | <File |
| 618 | RelativePath=".\llqueuedthread.h" | 618 | RelativePath=".\llqueuedthread.h" |
| 619 | > | 619 | > |
| 620 | </File> | 620 | </File> |
| 621 | <File | 621 | <File |
| 622 | RelativePath=".\llrun.h" | 622 | RelativePath=".\llrun.h" |
| 623 | > | 623 | > |
| 624 | </File> | 624 | </File> |
| 625 | <File | 625 | <File |
| 626 | RelativePath=".\llsd.h" | 626 | RelativePath=".\llsd.h" |
| 627 | > | 627 | > |
| 628 | </File> | 628 | </File> |
| 629 | <File | 629 | <File |
| 630 | RelativePath=".\llsdserialize.h" | 630 | RelativePath=".\llsdserialize.h" |
| 631 | > | 631 | > |
| 632 | </File> | 632 | </File> |
| 633 | <File | 633 | <File |
| 634 | RelativePath=".\llsdserialize_xml.h" | 634 | RelativePath=".\llsdserialize_xml.h" |
| 635 | > | 635 | > |
| 636 | </File> | 636 | </File> |
| 637 | <File | 637 | <File |
| 638 | RelativePath=".\llsdutil.h" | 638 | RelativePath=".\llsdutil.h" |
| 639 | > | 639 | > |
| 640 | </File> | 640 | </File> |
| 641 | <File | 641 | <File |
| 642 | RelativePath=".\llsecondlifeurls.h" | 642 | RelativePath=".\llsecondlifeurls.h" |
| 643 | > | 643 | > |
| 644 | </File> | 644 | </File> |
| 645 | <File | 645 | <File |
| 646 | RelativePath=".\llskiplist.h" | 646 | RelativePath=".\llskiplist.h" |
| 647 | > | 647 | > |
| 648 | </File> | 648 | </File> |
| 649 | <File | 649 | <File |
| 650 | RelativePath=".\llskipmap.h" | 650 | RelativePath=".\llskipmap.h" |
| 651 | > | 651 | > |
| 652 | </File> | 652 | </File> |
| 653 | <File | 653 | <File |
| 654 | RelativePath=".\llstat.h" | 654 | RelativePath=".\llstat.h" |
| 655 | > | 655 | > |
| 656 | </File> | 656 | </File> |
| 657 | <File | 657 | <File |
| 658 | RelativePath=".\llstatenums.h" | 658 | RelativePath=".\llstatenums.h" |
| 659 | > | 659 | > |
| 660 | </File> | 660 | </File> |
| 661 | <File | 661 | <File |
| 662 | RelativePath=".\llstl.h" | 662 | RelativePath=".\llstl.h" |
| 663 | > | 663 | > |
| 664 | </File> | 664 | </File> |
| 665 | <File | 665 | <File |
| 666 | RelativePath=".\llstreamtools.h" | 666 | RelativePath=".\llstreamtools.h" |
| 667 | > | 667 | > |
| 668 | </File> | 668 | </File> |
| 669 | <File | 669 | <File |
| 670 | RelativePath=".\llstrider.h" | 670 | RelativePath=".\llstrider.h" |
| 671 | > | 671 | > |
| 672 | </File> | 672 | </File> |
| 673 | <File | 673 | <File |
| 674 | RelativePath=".\llstring.h" | 674 | RelativePath=".\llstring.h" |
| 675 | > | 675 | > |
| 676 | </File> | 676 | </File> |
| 677 | <File | 677 | <File |
| 678 | RelativePath=".\llstringtable.h" | 678 | RelativePath=".\llstringtable.h" |
| 679 | > | 679 | > |
| 680 | </File> | 680 | </File> |
| 681 | <File | 681 | <File |
| 682 | RelativePath=".\llsys.h" | 682 | RelativePath=".\llsys.h" |
| 683 | > | 683 | > |
| 684 | </File> | 684 | </File> |
| 685 | <File | 685 | <File |
| 686 | RelativePath=".\llthread.h" | 686 | RelativePath=".\llthread.h" |
| 687 | > | 687 | > |
| 688 | </File> | 688 | </File> |
| 689 | <File | 689 | <File |
| 690 | RelativePath=".\lltimer.h" | 690 | RelativePath=".\lltimer.h" |
| 691 | > | 691 | > |
| 692 | </File> | 692 | </File> |
| 693 | <File | 693 | <File |
| 694 | RelativePath=".\lluri.h" | 694 | RelativePath=".\lluri.h" |
| 695 | > | 695 | > |
| 696 | </File> | 696 | </File> |
| 697 | <File | 697 | <File |
| 698 | RelativePath=".\lluuidhashmap.h" | 698 | RelativePath=".\lluuidhashmap.h" |
| 699 | > | 699 | > |
| 700 | </File> | 700 | </File> |
| 701 | <File | 701 | <File |
| 702 | RelativePath=".\llversion.h" | 702 | RelativePath=".\llversion.h" |
| 703 | > | 703 | > |
| 704 | </File> | 704 | </File> |
| 705 | <File | 705 | <File |
| 706 | RelativePath=".\llworkerthread.h" | 706 | RelativePath=".\llworkerthread.h" |
| 707 | > | 707 | > |
| 708 | </File> | 708 | </File> |
| 709 | <File | 709 | <File |
| 710 | RelativePath=".\new_mem_ops.h" | 710 | RelativePath=".\new_mem_ops.h" |
| 711 | > | 711 | > |
| 712 | </File> | 712 | </File> |
| 713 | <File | 713 | <File |
| 714 | RelativePath=".\priqueue.h" | 714 | RelativePath=".\priqueue.h" |
| 715 | > | 715 | > |
| 716 | </File> | 716 | </File> |
| 717 | <File | 717 | <File |
| 718 | RelativePath=".\processor.h" | 718 | RelativePath=".\processor.h" |
| 719 | > | 719 | > |
| 720 | </File> | 720 | </File> |
| 721 | <File | 721 | <File |
| 722 | RelativePath=".\roles_constants.h" | 722 | RelativePath=".\roles_constants.h" |
| 723 | > | 723 | > |
| 724 | </File> | 724 | </File> |
| 725 | <File | 725 | <File |
| 726 | RelativePath=".\stdenums.h" | 726 | RelativePath=".\stdenums.h" |
| 727 | > | 727 | > |
| 728 | </File> | 728 | </File> |
| 729 | <File | 729 | <File |
| 730 | RelativePath=".\stdtypes.h" | 730 | RelativePath=".\stdtypes.h" |
| 731 | > | 731 | > |
| 732 | </File> | 732 | </File> |
| 733 | <File | 733 | <File |
| 734 | RelativePath=".\string_table.h" | 734 | RelativePath=".\string_table.h" |
| 735 | > | 735 | > |
| 736 | </File> | 736 | </File> |
| 737 | <File | 737 | <File |
| 738 | RelativePath=".\timer.h" | 738 | RelativePath=".\timer.h" |
| 739 | > | 739 | > |
| 740 | </File> | 740 | </File> |
| 741 | <File | 741 | <File |
| 742 | RelativePath=".\timing.h" | 742 | RelativePath=".\timing.h" |
| 743 | > | 743 | > |
| 744 | </File> | 744 | </File> |
| 745 | <File | 745 | <File |
| 746 | RelativePath=".\u64.h" | 746 | RelativePath=".\u64.h" |
| 747 | > | 747 | > |
| 748 | </File> | 748 | </File> |
| 749 | </Filter> | 749 | </Filter> |
| 750 | <Filter | 750 | <Filter |
| 751 | Name="Resource Files" | 751 | Name="Resource Files" |
| 752 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | 752 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" |
| 753 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | 753 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
| 754 | > | 754 | > |
| 755 | </Filter> | 755 | </Filter> |
| 756 | </Files> | 756 | </Files> |
| 757 | <Globals> | 757 | <Globals> |
| 758 | </Globals> | 758 | </Globals> |
| 759 | </VisualStudioProject> | 759 | </VisualStudioProject> \ No newline at end of file |
diff --git a/linden/indra/llcommon/llcriticaldamp.cpp b/linden/indra/llcommon/llcriticaldamp.cpp index 2f83192..f574550 100644 --- a/linden/indra/llcommon/llcriticaldamp.cpp +++ b/linden/indra/llcommon/llcriticaldamp.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llcriticaldamp.h b/linden/indra/llcommon/llcriticaldamp.h index 670aa9f..6a35e5e 100644 --- a/linden/indra/llcommon/llcriticaldamp.h +++ b/linden/indra/llcommon/llcriticaldamp.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2002-2007, Linden Research, Inc. | 6 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h index 24e8543..291da19 100644 --- a/linden/indra/llcommon/lldarray.h +++ b/linden/indra/llcommon/lldarray.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldarrayptr.h b/linden/indra/llcommon/lldarrayptr.h index 18e1e93..308101c 100644 --- a/linden/indra/llcommon/lldarrayptr.h +++ b/linden/indra/llcommon/lldarrayptr.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp index 211d350..ccc314d 100644 --- a/linden/indra/llcommon/lldate.cpp +++ b/linden/indra/llcommon/lldate.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h index 8fb6d67..f8bd625 100644 --- a/linden/indra/llcommon/lldate.h +++ b/linden/indra/llcommon/lldate.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h index c0435fb..a3651ff 100644 --- a/linden/indra/llcommon/lldefs.h +++ b/linden/indra/llcommon/lldefs.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldepthstack.h b/linden/indra/llcommon/lldepthstack.h index 0011f30..f3ea709 100644 --- a/linden/indra/llcommon/lldepthstack.h +++ b/linden/indra/llcommon/lldepthstack.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldlinked.h b/linden/indra/llcommon/lldlinked.h index 488ef1e..0e39f69 100644 --- a/linden/indra/llcommon/lldlinked.h +++ b/linden/indra/llcommon/lldlinked.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lldqueueptr.h b/linden/indra/llcommon/lldqueueptr.h index 4d8a5ca..aca73d9 100644 --- a/linden/indra/llcommon/lldqueueptr.h +++ b/linden/indra/llcommon/lldqueueptr.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llendianswizzle.h b/linden/indra/llcommon/llendianswizzle.h index 34a530c..d06af70 100644 --- a/linden/indra/llcommon/llendianswizzle.h +++ b/linden/indra/llcommon/llendianswizzle.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llenum.h b/linden/indra/llcommon/llenum.h index 1dde5f8..310ccd2 100644 --- a/linden/indra/llcommon/llenum.h +++ b/linden/indra/llcommon/llenum.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp index 57e098e..9bcb415 100644 --- a/linden/indra/llcommon/llerror.cpp +++ b/linden/indra/llcommon/llerror.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -514,7 +515,11 @@ namespace LLError | |||
| 514 | { | 515 | { |
| 515 | void initForServer(const std::string& identity) | 516 | void initForServer(const std::string& identity) |
| 516 | { | 517 | { |
| 517 | std::string dir = LLApp::instance()->getOption("configdir"); | 518 | std::string dir = "/opt/linden/etc"; |
| 519 | if (LLApp::instance()) | ||
| 520 | { | ||
| 521 | dir = LLApp::instance()->getOption("configdir").asString(); | ||
| 522 | } | ||
| 518 | commonInit(dir); | 523 | commonInit(dir); |
| 519 | #if !LL_WINDOWS | 524 | #if !LL_WINDOWS |
| 520 | addRecorder(new RecordToSyslog(identity)); | 525 | addRecorder(new RecordToSyslog(identity)); |
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h index 1285491..9c8d018 100644 --- a/linden/indra/llcommon/llerror.h +++ b/linden/indra/llcommon/llerror.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h index f2c8755..c09a180 100644 --- a/linden/indra/llcommon/llerrorcontrol.h +++ b/linden/indra/llcommon/llerrorcontrol.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llerrorlegacy.h b/linden/indra/llcommon/llerrorlegacy.h index 5438a21..1671d0f 100644 --- a/linden/indra/llcommon/llerrorlegacy.h +++ b/linden/indra/llcommon/llerrorlegacy.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llerrorthread.cpp b/linden/indra/llcommon/llerrorthread.cpp index b9bb605..5f7d448 100644 --- a/linden/indra/llcommon/llerrorthread.cpp +++ b/linden/indra/llcommon/llerrorthread.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004-2007, Linden Research, Inc. | 4 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llerrorthread.h b/linden/indra/llcommon/llerrorthread.h index b2eda32..61bcf4c 100644 --- a/linden/indra/llcommon/llerrorthread.h +++ b/linden/indra/llcommon/llerrorthread.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp index bbb37c5..a6c4ef0 100644 --- a/linden/indra/llcommon/llevent.cpp +++ b/linden/indra/llcommon/llevent.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 5 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h index bcb6ee9..18b0596 100644 --- a/linden/indra/llcommon/llevent.h +++ b/linden/indra/llcommon/llevent.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 6 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lleventemitter.h b/linden/indra/llcommon/lleventemitter.h index ddaaca5..6390d34 100644 --- a/linden/indra/llcommon/lleventemitter.h +++ b/linden/indra/llcommon/lleventemitter.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp index 61b6df2..2b1d58f 100644 --- a/linden/indra/llcommon/llfasttimer.cpp +++ b/linden/indra/llcommon/llfasttimer.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h index 47634ac..4182500 100644 --- a/linden/indra/llcommon/llfasttimer.h +++ b/linden/indra/llcommon/llfasttimer.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp index feac28f..4520fd1 100644 --- a/linden/indra/llcommon/llfile.cpp +++ b/linden/indra/llcommon/llfile.cpp | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | * Copyright (c) 2006-2007, Linden Research, Inc. | 8 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 9 | * | 9 | * |
| 10 | * Second Life Viewer Source Code | ||
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 11 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 11 | * to you under the terms of the GNU General Public License, version 2.0 | 12 | * to you under the terms of the GNU General Public License, version 2.0 |
| 12 | * ("GPL"), unless you have obtained a separate licensing agreement | 13 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h index 5034cf7..9e1a98a 100644 --- a/linden/indra/llcommon/llfile.h +++ b/linden/indra/llcommon/llfile.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | * Copyright (c) 2006-2007, Linden Research, Inc. | 8 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 9 | * | 9 | * |
| 10 | * Second Life Viewer Source Code | ||
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 11 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 11 | * to you under the terms of the GNU General Public License, version 2.0 | 12 | * to you under the terms of the GNU General Public License, version 2.0 |
| 12 | * ("GPL"), unless you have obtained a separate licensing agreement | 13 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp index 795273b..397fcfd 100644 --- a/linden/indra/llcommon/llfixedbuffer.cpp +++ b/linden/indra/llcommon/llfixedbuffer.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2007, Linden Research, Inc. | 4 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llfixedbuffer.h b/linden/indra/llcommon/llfixedbuffer.h index 1501250..fbf2338 100644 --- a/linden/indra/llcommon/llfixedbuffer.h +++ b/linden/indra/llcommon/llfixedbuffer.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llformat.cpp b/linden/indra/llcommon/llformat.cpp index f088bc6..6a5b531 100644 --- a/linden/indra/llcommon/llformat.cpp +++ b/linden/indra/llcommon/llformat.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llformat.h b/linden/indra/llcommon/llformat.h index 135f9d2..b338591 100644 --- a/linden/indra/llcommon/llformat.h +++ b/linden/indra/llcommon/llformat.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2007, Linden Research, Inc. | 6 | * Copyright (c) 2007-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp index d41f904..5ae4a6b 100644 --- a/linden/indra/llcommon/llframetimer.cpp +++ b/linden/indra/llcommon/llframetimer.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2002-2007, Linden Research, Inc. | 4 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -52,6 +53,50 @@ void LLFrameTimer::updateFrameTime() | |||
| 52 | sFrameCount++; | 53 | sFrameCount++; |
| 53 | } | 54 | } |
| 54 | 55 | ||
| 56 | void LLFrameTimer::start() | ||
| 57 | { | ||
| 58 | reset(); | ||
| 59 | mStarted = TRUE; | ||
| 60 | } | ||
| 61 | |||
| 62 | void LLFrameTimer::stop() | ||
| 63 | { | ||
| 64 | mStarted = FALSE; | ||
| 65 | } | ||
| 66 | |||
| 67 | void LLFrameTimer::reset() | ||
| 68 | { | ||
| 69 | mStartTime = sFrameTime; | ||
| 70 | mExpiry = sFrameTime; | ||
| 71 | } | ||
| 72 | |||
| 73 | // Don't combine pause/unpause with start/stop | ||
| 74 | // Useage: | ||
| 75 | // LLFrameTime foo; // starts automatically | ||
| 76 | // foo.unpause(); // noop but safe | ||
| 77 | // foo.pause(); // pauses timer | ||
| 78 | // foo.unpause() // unpauses | ||
| 79 | // F32 elapsed = foo.getElapsedTimeF32() // does not include time between pause() and unpause() | ||
| 80 | // Note: elapsed would also be valid with no unpause() call (= time run until pause() called) | ||
| 81 | void LLFrameTimer::pause() | ||
| 82 | { | ||
| 83 | if (mStarted) | ||
| 84 | mStartTime = sFrameTime - mStartTime; // save dtime | ||
| 85 | mStarted = FALSE; | ||
| 86 | } | ||
| 87 | |||
| 88 | void LLFrameTimer::unpause() | ||
| 89 | { | ||
| 90 | if (!mStarted) | ||
| 91 | mStartTime = sFrameTime - mStartTime; // restore dtime | ||
| 92 | mStarted = TRUE; | ||
| 93 | } | ||
| 94 | |||
| 95 | void LLFrameTimer::setTimerExpirySec(F32 expiration) | ||
| 96 | { | ||
| 97 | mExpiry = expiration + mStartTime; | ||
| 98 | } | ||
| 99 | |||
| 55 | void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch) | 100 | void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch) |
| 56 | { | 101 | { |
| 57 | mStartTime = sFrameTime; | 102 | mStartTime = sFrameTime; |
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h index 007fe7d..0366e09 100644 --- a/linden/indra/llcommon/llframetimer.h +++ b/linden/indra/llcommon/llframetimer.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2002-2007, Linden Research, Inc. | 6 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -63,8 +64,7 @@ public: | |||
| 63 | return sTotalSeconds; | 64 | return sTotalSeconds; |
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | // Call this method once per frame to update the current frame | 67 | // Call this method once per frame to update the current frame time. |
| 67 | // time. | ||
| 68 | static void updateFrameTime(); | 68 | static void updateFrameTime(); |
| 69 | 69 | ||
| 70 | static S32 getFrameCount() { return sFrameCount; } | 70 | static S32 getFrameCount() { return sFrameCount; } |
| @@ -72,10 +72,12 @@ public: | |||
| 72 | static F32 getFrameDeltaTimeF32(); | 72 | static F32 getFrameDeltaTimeF32(); |
| 73 | 73 | ||
| 74 | // MANIPULATORS | 74 | // MANIPULATORS |
| 75 | void start() { reset(); mStarted = TRUE; } | 75 | void start(); |
| 76 | void stop() { mStarted = FALSE; } | 76 | void stop(); |
| 77 | void reset() { mStartTime = sFrameTime; mExpiry = sFrameTime; } | 77 | void reset(); |
| 78 | void setTimerExpirySec(F32 expiration) { mExpiry = expiration + mStartTime; } | 78 | void pause(); |
| 79 | void unpause(); | ||
| 80 | void setTimerExpirySec(F32 expiration); | ||
| 79 | void setExpiryAt(F64 seconds_since_epoch); | 81 | void setExpiryAt(F64 seconds_since_epoch); |
| 80 | BOOL checkExpirationAndReset(F32 expiration); | 82 | BOOL checkExpirationAndReset(F32 expiration); |
| 81 | F32 getElapsedTimeAndResetF32() { F32 t = F32(sFrameTime - mStartTime); reset(); return t; } | 83 | F32 getElapsedTimeAndResetF32() { F32 t = F32(sFrameTime - mStartTime); reset(); return t; } |
| @@ -85,7 +87,7 @@ public: | |||
| 85 | // ACCESSORS | 87 | // ACCESSORS |
| 86 | BOOL hasExpired() const { return (sFrameTime >= mExpiry); } | 88 | BOOL hasExpired() const { return (sFrameTime >= mExpiry); } |
| 87 | F32 getTimeToExpireF32() const { return (F32)(mExpiry - sFrameTime); } | 89 | F32 getTimeToExpireF32() const { return (F32)(mExpiry - sFrameTime); } |
| 88 | F32 getElapsedTimeF32() const { return (F32)(sFrameTime - mStartTime); } | 90 | F32 getElapsedTimeF32() const { return mStarted ? (F32)(sFrameTime - mStartTime) : (F32)mStartTime; } |
| 89 | BOOL getStarted() const { return mStarted; } | 91 | BOOL getStarted() const { return mStarted; } |
| 90 | 92 | ||
| 91 | // return the seconds since epoch when this timer will expire. | 93 | // return the seconds since epoch when this timer will expire. |
diff --git a/linden/indra/llcommon/llhash.h b/linden/indra/llcommon/llhash.h index bfe5397..c3c4ec9 100644 --- a/linden/indra/llcommon/llhash.h +++ b/linden/indra/llcommon/llhash.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llindexedqueue.h b/linden/indra/llcommon/llindexedqueue.h index 040de84..13e9f7a 100644 --- a/linden/indra/llcommon/llindexedqueue.h +++ b/linden/indra/llcommon/llindexedqueue.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2003-2007, Linden Research, Inc. | 6 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lllinkedqueue.h b/linden/indra/llcommon/lllinkedqueue.h index 699667a..9ce5a1b 100644 --- a/linden/indra/llcommon/lllinkedqueue.h +++ b/linden/indra/llcommon/lllinkedqueue.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp index bcffa7c..7923126 100644 --- a/linden/indra/llcommon/llliveappconfig.cpp +++ b/linden/indra/llcommon/llliveappconfig.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llliveappconfig.h b/linden/indra/llcommon/llliveappconfig.h index 822410f..f5c73d0 100644 --- a/linden/indra/llcommon/llliveappconfig.h +++ b/linden/indra/llcommon/llliveappconfig.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp index d289671..f116a2a 100644 --- a/linden/indra/llcommon/lllivefile.cpp +++ b/linden/indra/llcommon/lllivefile.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lllivefile.h b/linden/indra/llcommon/lllivefile.h index fbf2bdf..d8381bf 100644 --- a/linden/indra/llcommon/lllivefile.h +++ b/linden/indra/llcommon/lllivefile.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 5 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lllocalidhashmap.h b/linden/indra/llcommon/lllocalidhashmap.h index e1d3445..aae0bd9 100644 --- a/linden/indra/llcommon/lllocalidhashmap.h +++ b/linden/indra/llcommon/lllocalidhashmap.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h index 08c63e3..59d1cc8 100644 --- a/linden/indra/llcommon/lllslconstants.h +++ b/linden/indra/llcommon/lllslconstants.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 6 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmap.h b/linden/indra/llcommon/llmap.h index 2bda851..65e3da7 100644 --- a/linden/indra/llcommon/llmap.h +++ b/linden/indra/llcommon/llmap.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp index 8528433..284c8e7 100644 --- a/linden/indra/llcommon/llmemory.cpp +++ b/linden/indra/llcommon/llmemory.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -30,11 +31,6 @@ | |||
| 30 | #include "llmemory.h" | 31 | #include "llmemory.h" |
| 31 | #include "llmemtype.h" | 32 | #include "llmemtype.h" |
| 32 | 33 | ||
| 33 | // not defining nullfunc will currently crash when trying to use a LLHandle | ||
| 34 | template< typename _Ty > | ||
| 35 | const typename LLHandle< _Ty >::NullFunc | ||
| 36 | LLHandle< _Ty >::sNullFunc = LLHandle< _Ty >::defaultNullFunc; | ||
| 37 | |||
| 38 | //---------------------------------------------------------------------------- | 34 | //---------------------------------------------------------------------------- |
| 39 | 35 | ||
| 40 | //static | 36 | //static |
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h index 7a7996b..b6f42e3 100644 --- a/linden/indra/llcommon/llmemory.h +++ b/linden/indra/llcommon/llmemory.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -193,6 +194,14 @@ public: | |||
| 193 | } | 194 | } |
| 194 | return *this; | 195 | return *this; |
| 195 | } | 196 | } |
| 197 | |||
| 198 | // Just exchange the pointers, which will not change the reference counts. | ||
| 199 | static void swap(LLPointer<Type>& a, LLPointer<Type>& b) | ||
| 200 | { | ||
| 201 | Type* temp = a.mPointer; | ||
| 202 | a.mPointer = b.mPointer; | ||
| 203 | b.mPointer = temp; | ||
| 204 | } | ||
| 196 | 205 | ||
| 197 | protected: | 206 | protected: |
| 198 | void ref() | 207 | void ref() |
| @@ -239,29 +248,28 @@ class LLHandle | |||
| 239 | { | 248 | { |
| 240 | public: | 249 | public: |
| 241 | LLHandle() : | 250 | LLHandle() : |
| 242 | mPointer(sNullFunc()) | 251 | mPointer(NULL) |
| 243 | { | 252 | { |
| 244 | ref(); | ||
| 245 | } | 253 | } |
| 246 | 254 | ||
| 247 | LLHandle(Type* ptr) : | 255 | LLHandle(Type* ptr) : |
| 248 | mPointer(nonNull(ptr)) | 256 | mPointer(NULL) |
| 249 | { | 257 | { |
| 250 | ref(); | 258 | assign(ptr); |
| 251 | } | 259 | } |
| 252 | 260 | ||
| 253 | LLHandle(const LLHandle<Type>& ptr) : | 261 | LLHandle(const LLHandle<Type>& ptr) : |
| 254 | mPointer(ptr.mPointer) | 262 | mPointer(NULL) |
| 255 | { | 263 | { |
| 256 | ref(); | 264 | assign(ptr.mPointer); |
| 257 | } | 265 | } |
| 258 | 266 | ||
| 259 | // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed. | 267 | // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed. |
| 260 | template<typename Subclass> | 268 | template<typename Subclass> |
| 261 | LLHandle(const LLHandle<Subclass>& ptr) : | 269 | LLHandle(const LLHandle<Subclass>& ptr) : |
| 262 | mPointer(ptr.get()) | 270 | mPointer(NULL) |
| 263 | { | 271 | { |
| 264 | ref(); | 272 | assign(ptr.get()); |
| 265 | } | 273 | } |
| 266 | 274 | ||
| 267 | ~LLHandle() | 275 | ~LLHandle() |
| @@ -269,47 +277,39 @@ public: | |||
| 269 | unref(); | 277 | unref(); |
| 270 | } | 278 | } |
| 271 | 279 | ||
| 280 | const Type* operator->() const { return nonNull(mPointer); } | ||
| 281 | Type* operator->() { return nonNull(mPointer); } | ||
| 282 | |||
| 272 | Type* get() const { return mPointer; } | 283 | Type* get() const { return mPointer; } |
| 273 | const Type* operator->() const { return mPointer; } | 284 | // we disallow these operations as they expose our null objects to direct manipulation |
| 274 | Type* operator->() { return mPointer; } | 285 | // and bypass the reference counting semantics |
| 275 | const Type& operator*() const { return *mPointer; } | 286 | //const Type& operator*() const { return *nonNull(mPointer); } |
| 276 | Type& operator*() { return *mPointer; } | 287 | //Type& operator*() { return *nonNull(mPointer); } |
| 277 | 288 | ||
| 278 | operator BOOL() const { return (mPointer != sNullFunc()); } | 289 | operator BOOL() const { return mPointer != NULL; } |
| 279 | operator bool() const { return (mPointer != sNullFunc()); } | 290 | operator bool() const { return mPointer != NULL; } |
| 280 | bool operator!() const { return (mPointer == sNullFunc()); } | 291 | bool operator!() const { return mPointer == NULL; } |
| 281 | bool isNull() const { return (mPointer == sNullFunc()); } | 292 | bool isNull() const { return mPointer == NULL; } |
| 282 | bool notNull() const { return (mPointer != sNullFunc()); } | 293 | bool notNull() const { return mPointer != NULL; } |
| 283 | 294 | ||
| 284 | 295 | ||
| 285 | operator Type*() const { return mPointer; } | 296 | operator Type*() const { return mPointer; } |
| 286 | operator const Type*() const { return mPointer; } | 297 | operator const Type*() const { return mPointer; } |
| 287 | bool operator !=(Type* ptr) const { return (mPointer != nonNull(ptr)); } | 298 | bool operator !=(Type* ptr) const { return (mPointer != ptr); } |
| 288 | bool operator ==(Type* ptr) const { return (mPointer == nonNull(ptr)); } | 299 | bool operator ==(Type* ptr) const { return (mPointer == ptr); } |
| 289 | bool operator ==(const LLHandle<Type>& ptr) const { return (mPointer == ptr.mPointer); } | 300 | bool operator ==(const LLHandle<Type>& ptr) const { return (mPointer == ptr.mPointer); } |
| 290 | bool operator < (const LLHandle<Type>& ptr) const { return (mPointer < ptr.mPointer); } | 301 | bool operator < (const LLHandle<Type>& ptr) const { return (mPointer < ptr.mPointer); } |
| 291 | bool operator > (const LLHandle<Type>& ptr) const { return (mPointer > ptr.mPointer); } | 302 | bool operator > (const LLHandle<Type>& ptr) const { return (mPointer > ptr.mPointer); } |
| 292 | 303 | ||
| 293 | LLHandle<Type>& operator =(Type* ptr) | 304 | LLHandle<Type>& operator =(Type* ptr) |
| 294 | { | 305 | { |
| 295 | if( mPointer != ptr ) | 306 | assign(ptr); |
| 296 | { | ||
| 297 | unref(); | ||
| 298 | mPointer = nonNull(ptr); | ||
| 299 | ref(); | ||
| 300 | } | ||
| 301 | |||
| 302 | return *this; | 307 | return *this; |
| 303 | } | 308 | } |
| 304 | 309 | ||
| 305 | LLHandle<Type>& operator =(const LLHandle<Type>& ptr) | 310 | LLHandle<Type>& operator =(const LLHandle<Type>& ptr) |
| 306 | { | 311 | { |
| 307 | if( mPointer != ptr.mPointer ) | 312 | assign(ptr.mPointer); |
| 308 | { | ||
| 309 | unref(); | ||
| 310 | mPointer = ptr.mPointer; | ||
| 311 | ref(); | ||
| 312 | } | ||
| 313 | return *this; | 313 | return *this; |
| 314 | } | 314 | } |
| 315 | 315 | ||
| @@ -317,12 +317,7 @@ public: | |||
| 317 | template<typename Subclass> | 317 | template<typename Subclass> |
| 318 | LLHandle<Type>& operator =(const LLHandle<Subclass>& ptr) | 318 | LLHandle<Type>& operator =(const LLHandle<Subclass>& ptr) |
| 319 | { | 319 | { |
| 320 | if( mPointer != ptr.get() ) | 320 | assign(ptr.get()); |
| 321 | { | ||
| 322 | unref(); | ||
| 323 | mPointer = ptr.get(); | ||
| 324 | ref(); | ||
| 325 | } | ||
| 326 | return *this; | 321 | return *this; |
| 327 | } | 322 | } |
| 328 | 323 | ||
| @@ -344,9 +339,9 @@ protected: | |||
| 344 | if (mPointer) | 339 | if (mPointer) |
| 345 | { | 340 | { |
| 346 | Type *tempp = mPointer; | 341 | Type *tempp = mPointer; |
| 347 | mPointer = sNullFunc(); | 342 | mPointer = NULL; |
| 348 | tempp->unref(); | 343 | tempp->unref(); |
| 349 | if (mPointer != sNullFunc()) | 344 | if (mPointer != NULL) |
| 350 | { | 345 | { |
| 351 | llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl; | 346 | llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl; |
| 352 | unref(); | 347 | unref(); |
| @@ -354,19 +349,22 @@ protected: | |||
| 354 | } | 349 | } |
| 355 | } | 350 | } |
| 356 | 351 | ||
| 357 | static Type* nonNull(Type* ptr) | 352 | void assign(Type* ptr) |
| 358 | { | 353 | { |
| 359 | return ptr == NULL ? sNullFunc() : ptr; | 354 | if( mPointer != ptr ) |
| 355 | { | ||
| 356 | unref(); | ||
| 357 | mPointer = ptr; | ||
| 358 | ref(); | ||
| 359 | } | ||
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | static Type* defaultNullFunc() | 362 | static Type* nonNull(Type* ptr) |
| 363 | { | 363 | { |
| 364 | llerrs << "No null value provided for LLHandle" << llendl; | 364 | return ptr == NULL ? sNullFunc() : ptr; |
| 365 | return NULL; | ||
| 366 | } | 365 | } |
| 367 | 366 | ||
| 368 | protected: | 367 | protected: |
| 369 | |||
| 370 | Type* mPointer; | 368 | Type* mPointer; |
| 371 | }; | 369 | }; |
| 372 | 370 | ||
diff --git a/linden/indra/llcommon/llmemorystream.cpp b/linden/indra/llcommon/llmemorystream.cpp index ca3311d..ac9e61c 100644 --- a/linden/indra/llcommon/llmemorystream.cpp +++ b/linden/indra/llcommon/llmemorystream.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2005-2007, Linden Research, Inc. | 7 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmemorystream.h b/linden/indra/llcommon/llmemorystream.h index 4210eb9..f00bc28 100644 --- a/linden/indra/llcommon/llmemorystream.h +++ b/linden/indra/llcommon/llmemorystream.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2005-2007, Linden Research, Inc. | 7 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h index 0af1ed3..501b5f5 100644 --- a/linden/indra/llcommon/llmemtype.h +++ b/linden/indra/llcommon/llmemtype.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp index d76359d..ec1383f 100644 --- a/linden/indra/llcommon/llmortician.cpp +++ b/linden/indra/llcommon/llmortician.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2005-2007, Linden Research, Inc. | 4 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llmortician.h b/linden/indra/llcommon/llmortician.h index c3e4b05..353f263 100644 --- a/linden/indra/llcommon/llmortician.h +++ b/linden/indra/llcommon/llmortician.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llnametable.h b/linden/indra/llcommon/llnametable.h index 80b9be4..c3bdfbd 100644 --- a/linden/indra/llcommon/llnametable.h +++ b/linden/indra/llcommon/llnametable.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llpagemem.h b/linden/indra/llcommon/llpagemem.h index 7081251..f3d6061 100644 --- a/linden/indra/llcommon/llpagemem.h +++ b/linden/indra/llcommon/llpagemem.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2002-2007, Linden Research, Inc. | 4 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h index 9db0108..495b9e8 100644 --- a/linden/indra/llcommon/llpreprocessor.h +++ b/linden/indra/llcommon/llpreprocessor.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 6 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -41,6 +42,13 @@ | |||
| 41 | #define LL_BIG_ENDIAN 1 | 42 | #define LL_BIG_ENDIAN 1 |
| 42 | #endif | 43 | #endif |
| 43 | 44 | ||
| 45 | // Per-compiler switches | ||
| 46 | #ifdef __GNUC__ | ||
| 47 | #define LL_FORCE_INLINE inline __attribute__((always_inline)) | ||
| 48 | #else | ||
| 49 | #define LL_FORCE_INLINE __forceinline | ||
| 50 | #endif | ||
| 51 | |||
| 44 | // Per-OS feature switches. | 52 | // Per-OS feature switches. |
| 45 | 53 | ||
| 46 | #if LL_DARWIN | 54 | #if LL_DARWIN |
| @@ -81,9 +89,9 @@ | |||
| 81 | #endif | 89 | #endif |
| 82 | 90 | ||
| 83 | // Deal with the differeneces on Windows | 91 | // Deal with the differeneces on Windows |
| 84 | #if defined(LL_WINDOWS) | 92 | #if LL_WINDOWS |
| 85 | #define snprintf _snprintf /*Flawfinder: ignore*/ | 93 | #define snprintf safe_snprintf /* Flawfinder: ignore */ |
| 86 | #endif // LL_WINDOWS | 94 | #endif // LL_WINDOWS |
| 87 | 95 | ||
| 88 | // Static linking with apr on windows needs to be declared. | 96 | // Static linking with apr on windows needs to be declared. |
| 89 | #ifdef LL_WINDOWS | 97 | #ifdef LL_WINDOWS |
diff --git a/linden/indra/llcommon/llpriqueuemap.h b/linden/indra/llcommon/llpriqueuemap.h index 20cbc6b..deda338 100644 --- a/linden/indra/llcommon/llpriqueuemap.h +++ b/linden/indra/llcommon/llpriqueuemap.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp index 3408cb1..d269e35 100644 --- a/linden/indra/llcommon/llprocessor.cpp +++ b/linden/indra/llcommon/llprocessor.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -103,6 +104,7 @@ static void _Delay(unsigned int ms) | |||
| 103 | CProcessor::CProcessor() | 104 | CProcessor::CProcessor() |
| 104 | { | 105 | { |
| 105 | uqwFrequency = 0; | 106 | uqwFrequency = 0; |
| 107 | strCPUName[0] = 0; | ||
| 106 | memset(&CPUInfo, 0, sizeof(CPUInfo)); | 108 | memset(&CPUInfo, 0, sizeof(CPUInfo)); |
| 107 | } | 109 | } |
| 108 | 110 | ||
| @@ -245,77 +247,44 @@ bool CProcessor::AnalyzeIntelProcessor() | |||
| 245 | CPUInfo.uiType = (eaxreg >> 12) & 0x3; | 247 | CPUInfo.uiType = (eaxreg >> 12) & 0x3; |
| 246 | CPUInfo.uiBrandID = ebxreg & 0xF; | 248 | CPUInfo.uiBrandID = ebxreg & 0xF; |
| 247 | 249 | ||
| 248 | // Now we can translate the type number to a more understandable string format | 250 | static const char* INTEL_BRAND[] = |
| 249 | switch (CPUInfo.uiType) | ||
| 250 | { | 251 | { |
| 251 | case 0: // Type = 0: Original OEM processor | 252 | /* 0x00 */ "", |
| 252 | strcpy(CPUInfo.strType, "Original OEM"); /* Flawfinder: ignore */ | 253 | /* 0x01 */ "0.18 micron Intel Celeron", |
| 253 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | 254 | /* 0x02 */ "0.18 micron Intel Pentium III", |
| 254 | strcat(strCPUName, " "); /* Flawfinder: ignore */ | 255 | /* 0x03 */ "0.13 micron Intel Celeron", |
| 255 | break; | 256 | /* 0x04 */ "0.13 micron Intel Pentium III", |
| 256 | case 1: // Type = 1: Overdrive processor | 257 | /* 0x05 */ "", |
| 257 | strcpy(CPUInfo.strType, "Overdrive"); /* Flawfinder: ignore */ | 258 | /* 0x06 */ "0.13 micron Intel Pentium III mobile", |
| 258 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | 259 | /* 0x07 */ "0.13 micron Intel Celeron mobile", |
| 259 | strcat(strCPUName, " "); /* Flawfinder: ignore */ | 260 | /* 0x08 */ "0.18 micron Intel Pentium 4", |
| 260 | break; | 261 | /* 0x09 */ "0.13 micron Intel Pentium 4", |
| 261 | case 2: // Type = 2: Dual-capable processor | 262 | /* 0x0A */ "0.13 micron Intel Pentium 4", |
| 262 | strcpy(CPUInfo.strType, "Dual-capable"); /* Flawfinder: ignore */ | 263 | /* 0x0B */ "0.13 micron Intel Pentium 4 Xeon", |
| 263 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | 264 | /* 0x0C */ "", |
| 264 | strcat(strCPUName, " "); /* Flawfinder: ignore */ | 265 | /* 0x0D */ "", |
| 265 | break; | 266 | /* 0x0E */ "0.18 micron Intel Pentium 4 Xeon", |
| 266 | case 3: // Type = 3: Reserved for future use | 267 | /* 0x0F */ "", |
| 267 | strcpy(CPUInfo.strType, "Reserved"); /* Flawfinder: ignore */ | 268 | /* 0x10 */ "", |
| 268 | break; | 269 | /* 0x11 */ "", |
| 269 | default: // This should be never called, cause we just mask 2 bits --> [0..3] | 270 | /* 0x12 */ "Intel Celeron M", |
| 270 | strcpy(CPUInfo.strType, "Unknown"); /* Flawfinder: ignore */ | 271 | /* 0x13 */ "mobile Intel Celeron", |
| 271 | break; | 272 | /* 0x14 */ "Intel Celeron", |
| 272 | } | 273 | /* 0x15 */ "mobile Intel", |
| 273 | 274 | /* 0x16 */ "Intel Pentium M", | |
| 274 | // Then we translate the brand id: | 275 | /* 0x17 */ "mobile Intel Celeron", |
| 275 | switch (CPUInfo.uiBrandID) | 276 | }; |
| 277 | |||
| 278 | // Only override the brand if we have it in the lookup table. We should | ||
| 279 | // already have a string here from GetCPUInfo(). JC | ||
| 280 | if (CPUInfo.uiBrandID < sizeof(INTEL_BRAND)) | ||
| 276 | { | 281 | { |
| 277 | case 0: // Brand id = 0: Brand id not supported on this processor | 282 | strcpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID]); |
| 278 | strcpy(CPUInfo.strBrandID, "Not supported"); /* Flawfinder: ignore */ | 283 | |
| 279 | break; | 284 | if (CPUInfo.uiBrandID == 3 && CPUInfo.uiModel == 6) |
| 280 | case 1: // Brand id = 1: Intel Celeron (0.18 micron) processor | 285 | { |
| 281 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Celeron"); /* Flawfinder: ignore */ | 286 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Pentium III Xeon"); |
| 282 | break; | 287 | } |
| 283 | case 2: // Brand id = 2: Intel Pentium III (0.18 micron) processor | ||
| 284 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Pentium III"); /* Flawfinder: ignore */ | ||
| 285 | break; | ||
| 286 | case 3: // Brand id = 3: Model dependent | ||
| 287 | if (CPUInfo.uiModel == 6) // If the cpu model is Celeron (well, I'm NOT SURE!!!) | ||
| 288 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Celeron"); /* Flawfinder: ignore */ | ||
| 289 | else | ||
| 290 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Pentium III Xeon"); /* Flawfinder: ignore */ | ||
| 291 | break; | ||
| 292 | case 4: // Brand id = 4: Intel Pentium III Tualatin (0.13 micron) processor | ||
| 293 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Pentium III"); /* Flawfinder: ignore */ | ||
| 294 | break; | ||
| 295 | case 6: // Brand id = 6: Intel Pentium III mobile (0.13 micron) processor | ||
| 296 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Pentium III mobile"); /* Flawfinder: ignore */ | ||
| 297 | break; | ||
| 298 | case 7: // Brand id = 7: Intel Celeron mobile (0.13 micron) processor | ||
| 299 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Celeron mobile"); /* Flawfinder: ignore */ | ||
| 300 | break; | ||
| 301 | case 8: // Brand id = 8: Intel Pentium 4 Willamette (0.18 micron) processor | ||
| 302 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Pentium 4"); /* Flawfinder: ignore */ | ||
| 303 | break; | ||
| 304 | case 9: // Brand id = 9: Intel Pentium 4 Northwood (0.13 micron) processor | ||
| 305 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Pentium 4"); /* Flawfinder: ignore */ | ||
| 306 | break; | ||
| 307 | case 0xA: // Brand id = 0xA: Intel Pentium 4 Northwood (0.13 micron processor) | ||
| 308 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Pentium 4"); /* Flawfinder: ignore */ | ||
| 309 | break; // No idea, where the difference to id=9 is | ||
| 310 | case 0xB: // Brand id = 0xB: Intel Pentium 4 Northwood Xeon (0.13 micron processor) | ||
| 311 | strcpy(CPUInfo.strBrandID, "0.13 micron Intel Pentium 4 Xeon"); /* Flawfinder: ignore */ | ||
| 312 | break; | ||
| 313 | case 0xE: // Brand id = 0xE: Intel Pentium 4 Willamette Xeon (0.18 micron processor) | ||
| 314 | strcpy(CPUInfo.strBrandID, "0.18 micron Intel Pentium 4 Xeon"); /* Flawfinder: ignore */ | ||
| 315 | break; | ||
| 316 | default: // Should be never called, but sure is sure | ||
| 317 | strcpy(CPUInfo.strBrandID, "Unknown"); /* Flawfinder: ignore */ | ||
| 318 | break; | ||
| 319 | } | 288 | } |
| 320 | 289 | ||
| 321 | // Then we translate the cpu family | 290 | // Then we translate the cpu family |
| @@ -617,7 +586,7 @@ bool CProcessor::AnalyzeIntelProcessor() | |||
| 617 | else | 586 | else |
| 618 | { | 587 | { |
| 619 | // If there's no serial number support we just put "No serial number" | 588 | // If there's no serial number support we just put "No serial number" |
| 620 | snprintf( /* Flawfinder: ignore */ | 589 | snprintf( /* Flawfinder: ignore */ |
| 621 | CPUInfo.strProcessorSerial, | 590 | CPUInfo.strProcessorSerial, |
| 622 | sizeof(CPUInfo.strProcessorSerial), | 591 | sizeof(CPUInfo.strProcessorSerial), |
| 623 | "No Processor Serial Number"); | 592 | "No Processor Serial Number"); |
| @@ -667,33 +636,6 @@ bool CProcessor::AnalyzeAMDProcessor() | |||
| 667 | CPUInfo.uiFamily = (eaxreg >> 8) & 0xF; | 636 | CPUInfo.uiFamily = (eaxreg >> 8) & 0xF; |
| 668 | CPUInfo.uiType = (eaxreg >> 12) & 0x3; | 637 | CPUInfo.uiType = (eaxreg >> 12) & 0x3; |
| 669 | 638 | ||
| 670 | // After that, we translate the processor type (see CProcessor::AnalyzeIntelProcessor() | ||
| 671 | // for further comments on this) | ||
| 672 | switch (CPUInfo.uiType) | ||
| 673 | { | ||
| 674 | case 0: | ||
| 675 | strcpy(CPUInfo.strType, "Original OEM"); /* Flawfinder: ignore */ | ||
| 676 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | ||
| 677 | strcat(strCPUName, " "); /*Flawfinder: ignore*/ | ||
| 678 | break; | ||
| 679 | case 1: | ||
| 680 | strcpy(CPUInfo.strType, "Overdrive"); /* Flawfinder: ignore */ | ||
| 681 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | ||
| 682 | strcat(strCPUName, " "); /*Flawfinder: ignore*/ | ||
| 683 | break; | ||
| 684 | case 2: | ||
| 685 | strcpy(CPUInfo.strType, "Dual-capable"); /* Flawfinder: ignore */ | ||
| 686 | strcpy(strCPUName, CPUInfo.strType); /* Flawfinder: ignore */ | ||
| 687 | strcat(strCPUName, " "); /*Flawfinder: ignore*/ | ||
| 688 | break; | ||
| 689 | case 3: | ||
| 690 | strcpy(CPUInfo.strType, "Reserved"); /* Flawfinder: ignore */ | ||
| 691 | break; | ||
| 692 | default: | ||
| 693 | strcpy(CPUInfo.strType, "Unknown"); /* Flawfinder: ignore */ | ||
| 694 | break; | ||
| 695 | } | ||
| 696 | |||
| 697 | // Now we check if the processor supports the brand id string extended CPUID level | 639 | // Now we check if the processor supports the brand id string extended CPUID level |
| 698 | if (CPUInfo.MaxSupportedExtendedLevel >= 0x80000004) | 640 | if (CPUInfo.MaxSupportedExtendedLevel >= 0x80000004) |
| 699 | { | 641 | { |
| @@ -728,7 +670,7 @@ bool CProcessor::AnalyzeAMDProcessor() | |||
| 728 | else | 670 | else |
| 729 | { | 671 | { |
| 730 | // Or just tell there is no brand id string support | 672 | // Or just tell there is no brand id string support |
| 731 | strcpy(CPUInfo.strBrandID, "Not supported"); /* Flawfinder: ignore */ | 673 | strcpy(CPUInfo.strBrandID, ""); /* Flawfinder: ignore */ |
| 732 | } | 674 | } |
| 733 | 675 | ||
| 734 | // After that we translate the processor family | 676 | // After that we translate the processor family |
| @@ -993,7 +935,7 @@ bool CProcessor::AnalyzeAMDProcessor() | |||
| 993 | if ((ecxreg >> 24) > 0) | 935 | if ((ecxreg >> 24) > 0) |
| 994 | { | 936 | { |
| 995 | CPUInfo._L1.Data.bPresent = true; | 937 | CPUInfo._L1.Data.bPresent = true; |
| 996 | snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", ecxreg >> 24); /*Flawfinder: ignore*/ | 938 | snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", ecxreg >> 24); /* Flawfinder: ignore */ |
| 997 | CPUInfo._L1.Data.uiAssociativeWays = (ecxreg >> 15) & 0xFF; | 939 | CPUInfo._L1.Data.uiAssociativeWays = (ecxreg >> 15) & 0xFF; |
| 998 | CPUInfo._L1.Data.uiLineSize = ecxreg & 0xFF; | 940 | CPUInfo._L1.Data.uiLineSize = ecxreg & 0xFF; |
| 999 | } | 941 | } |
| @@ -1001,7 +943,7 @@ bool CProcessor::AnalyzeAMDProcessor() | |||
| 1001 | if ((edxreg >> 24) > 0) | 943 | if ((edxreg >> 24) > 0) |
| 1002 | { | 944 | { |
| 1003 | CPUInfo._L1.Instruction.bPresent = true; | 945 | CPUInfo._L1.Instruction.bPresent = true; |
| 1004 | snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", edxreg >> 24); /*Flawfinder: ignore*/ | 946 | snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", edxreg >> 24); /* Flawfinder: ignore */ |
| 1005 | CPUInfo._L1.Instruction.uiAssociativeWays = (edxreg >> 15) & 0xFF; | 947 | CPUInfo._L1.Instruction.uiAssociativeWays = (edxreg >> 15) & 0xFF; |
| 1006 | CPUInfo._L1.Instruction.uiLineSize = edxreg & 0xFF; | 948 | CPUInfo._L1.Instruction.uiLineSize = edxreg & 0xFF; |
| 1007 | } | 949 | } |
| @@ -1025,7 +967,7 @@ bool CProcessor::AnalyzeAMDProcessor() | |||
| 1025 | if (((ecxreg >> 12) & 0xF) > 0) | 967 | if (((ecxreg >> 12) & 0xF) > 0) |
| 1026 | { | 968 | { |
| 1027 | CPUInfo._L2.bPresent = true; | 969 | CPUInfo._L2.bPresent = true; |
| 1028 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", ecxreg >> 16); /*Flawfinder: ignore*/ | 970 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", ecxreg >> 16); /* Flawfinder: ignore */ |
| 1029 | switch ((ecxreg >> 12) & 0xF) | 971 | switch ((ecxreg >> 12) & 0xF) |
| 1030 | { | 972 | { |
| 1031 | case 1: | 973 | case 1: |
| @@ -1118,29 +1060,9 @@ bool CProcessor::AnalyzeUnknownProcessor() | |||
| 1118 | strcpy(CPUInfo.strProcessorSerial, "Unknown / Not supported"); /*Flawfinder: ignore*/ | 1060 | strcpy(CPUInfo.strProcessorSerial, "Unknown / Not supported"); /*Flawfinder: ignore*/ |
| 1119 | 1061 | ||
| 1120 | // For the family, model and brand id we can only print the numeric value | 1062 | // For the family, model and brand id we can only print the numeric value |
| 1121 | snprintf(CPUInfo.strBrandID, sizeof(CPUInfo.strBrandID), "Brand-ID number %d", CPUInfo.uiBrandID); /*Flawfinder: ignore*/ | 1063 | snprintf(CPUInfo.strBrandID, sizeof(CPUInfo.strBrandID), "Brand-ID number %d", CPUInfo.uiBrandID); /* Flawfinder: ignore */ |
| 1122 | snprintf(CPUInfo.strFamily, sizeof(CPUInfo.strFamily), "Family number %d", CPUInfo.uiFamily); /*Flawfinder: ignore*/ | 1064 | snprintf(CPUInfo.strFamily, sizeof(CPUInfo.strFamily), "Family number %d", CPUInfo.uiFamily); /* Flawfinder: ignore */ |
| 1123 | snprintf(CPUInfo.strModel, sizeof(CPUInfo.strModel), "Model number %d", CPUInfo.uiModel); /*Flawfinder: ignore*/ | 1065 | snprintf(CPUInfo.strModel, sizeof(CPUInfo.strModel), "Model number %d", CPUInfo.uiModel); /* Flawfinder: ignore */ |
| 1124 | |||
| 1125 | // Nevertheless we can determine the processor type | ||
| 1126 | switch (CPUInfo.uiType) | ||
| 1127 | { | ||
| 1128 | case 0: | ||
| 1129 | strcpy(CPUInfo.strType, "Original OEM"); /*Flawfinder: ignore*/ | ||
| 1130 | break; | ||
| 1131 | case 1: | ||
| 1132 | strcpy(CPUInfo.strType, "Overdrive"); /*Flawfinder: ignore*/ | ||
| 1133 | break; | ||
| 1134 | case 2: | ||
| 1135 | strcpy(CPUInfo.strType, "Dual-capable"); /*Flawfinder: ignore*/ | ||
| 1136 | break; | ||
| 1137 | case 3: | ||
| 1138 | strcpy(CPUInfo.strType, "Reserved"); /*Flawfinder: ignore*/ | ||
| 1139 | break; | ||
| 1140 | default: | ||
| 1141 | strcpy(CPUInfo.strType, "Unknown"); /*Flawfinder: ignore*/ | ||
| 1142 | break; | ||
| 1143 | } | ||
| 1144 | 1066 | ||
| 1145 | // And thats it | 1067 | // And thats it |
| 1146 | return true; | 1068 | return true; |
| @@ -1653,6 +1575,8 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1653 | *((unsigned long *) CPUInfo.strVendor) = ebxreg; | 1575 | *((unsigned long *) CPUInfo.strVendor) = ebxreg; |
| 1654 | *((unsigned long *) (CPUInfo.strVendor+4)) = edxreg; | 1576 | *((unsigned long *) (CPUInfo.strVendor+4)) = edxreg; |
| 1655 | *((unsigned long *) (CPUInfo.strVendor+8)) = ecxreg; | 1577 | *((unsigned long *) (CPUInfo.strVendor+8)) = ecxreg; |
| 1578 | // Null terminate for string comparisons below. | ||
| 1579 | CPUInfo.strVendor[12] = 0; | ||
| 1656 | 1580 | ||
| 1657 | // We can also read the max. supported standard CPUID level | 1581 | // We can also read the max. supported standard CPUID level |
| 1658 | CPUInfo.MaxSupportedLevel = eaxreg & 0xFFFF; | 1582 | CPUInfo.MaxSupportedLevel = eaxreg & 0xFFFF; |
| @@ -1668,22 +1592,52 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1668 | CPUInfo.MaxSupportedExtendedLevel = eaxreg; | 1592 | CPUInfo.MaxSupportedExtendedLevel = eaxreg; |
| 1669 | 1593 | ||
| 1670 | // Then we switch to the specific processor vendors | 1594 | // Then we switch to the specific processor vendors |
| 1671 | switch (ebxreg) | 1595 | // See http://www.sandpile.org/ia32/cpuid.htm |
| 1596 | if (!strcmp(CPUInfo.strVendor, "GenuineIntel")) | ||
| 1672 | { | 1597 | { |
| 1673 | case 0x756E6547: // GenuineIntel | 1598 | AnalyzeIntelProcessor(); |
| 1674 | AnalyzeIntelProcessor(); | 1599 | } |
| 1675 | break; | 1600 | else if (!strcmp(CPUInfo.strVendor, "AuthenticAMD")) |
| 1676 | case 0x68747541: // AuthenticAMD | 1601 | { |
| 1677 | AnalyzeAMDProcessor(); | 1602 | AnalyzeAMDProcessor(); |
| 1678 | break; | 1603 | } |
| 1679 | case 0x69727943: // CyrixInstead | 1604 | else if (!strcmp(CPUInfo.strVendor, "UMC UMC UMC")) |
| 1680 | // I really do not know anyone owning such a piece of crab | 1605 | { |
| 1681 | // So we analyze it as an unknown processor *ggggg* | 1606 | AnalyzeUnknownProcessor(); |
| 1682 | default: | 1607 | } |
| 1683 | AnalyzeUnknownProcessor(); | 1608 | else if (!strcmp(CPUInfo.strVendor, "CyrixInstead")) |
| 1684 | break; | 1609 | { |
| 1610 | AnalyzeUnknownProcessor(); | ||
| 1611 | } | ||
| 1612 | else if (!strcmp(CPUInfo.strVendor, "NexGenDriven")) | ||
| 1613 | { | ||
| 1614 | AnalyzeUnknownProcessor(); | ||
| 1615 | } | ||
| 1616 | else if (!strcmp(CPUInfo.strVendor, "CentaurHauls")) | ||
| 1617 | { | ||
| 1618 | AnalyzeUnknownProcessor(); | ||
| 1619 | } | ||
| 1620 | else if (!strcmp(CPUInfo.strVendor, "RiseRiseRise")) | ||
| 1621 | { | ||
| 1622 | AnalyzeUnknownProcessor(); | ||
| 1623 | } | ||
| 1624 | else if (!strcmp(CPUInfo.strVendor, "SiS SiS SiS")) | ||
| 1625 | { | ||
| 1626 | AnalyzeUnknownProcessor(); | ||
| 1627 | } | ||
| 1628 | else if (!strcmp(CPUInfo.strVendor, "GenuineTMx86")) | ||
| 1629 | { | ||
| 1630 | // Transmeta | ||
| 1631 | AnalyzeUnknownProcessor(); | ||
| 1632 | } | ||
| 1633 | else if (!strcmp(CPUInfo.strVendor, "Geode by NSC")) | ||
| 1634 | { | ||
| 1635 | AnalyzeUnknownProcessor(); | ||
| 1636 | } | ||
| 1637 | else | ||
| 1638 | { | ||
| 1639 | AnalyzeUnknownProcessor(); | ||
| 1685 | } | 1640 | } |
| 1686 | |||
| 1687 | #endif | 1641 | #endif |
| 1688 | // After all we return the class CPUInfo member var | 1642 | // After all we return the class CPUInfo member var |
| 1689 | return (&CPUInfo); | 1643 | return (&CPUInfo); |
| @@ -1767,6 +1721,7 @@ void CProcessor::TranslateProcessorConfiguration() | |||
| 1767 | CProcessor::CProcessor() | 1721 | CProcessor::CProcessor() |
| 1768 | { | 1722 | { |
| 1769 | uqwFrequency = 0; | 1723 | uqwFrequency = 0; |
| 1724 | strCPUName[0] = 0; | ||
| 1770 | memset(&CPUInfo, 0, sizeof(CPUInfo)); | 1725 | memset(&CPUInfo, 0, sizeof(CPUInfo)); |
| 1771 | } | 1726 | } |
| 1772 | 1727 | ||
| @@ -1970,7 +1925,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1970 | if(l1dcachesize != 0) | 1925 | if(l1dcachesize != 0) |
| 1971 | { | 1926 | { |
| 1972 | CPUInfo._L1.Data.bPresent = true; | 1927 | CPUInfo._L1.Data.bPresent = true; |
| 1973 | snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", l1dcachesize / 1024); /* Flawfinder: ignore */ | 1928 | snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", l1dcachesize / 1024); /* Flawfinder: ignore */ |
| 1974 | // CPUInfo._L1.Data.uiAssociativeWays = ???; | 1929 | // CPUInfo._L1.Data.uiAssociativeWays = ???; |
| 1975 | CPUInfo._L1.Data.uiLineSize = cachelinesize; | 1930 | CPUInfo._L1.Data.uiLineSize = cachelinesize; |
| 1976 | } | 1931 | } |
| @@ -1978,7 +1933,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1978 | if(l1icachesize != 0) | 1933 | if(l1icachesize != 0) |
| 1979 | { | 1934 | { |
| 1980 | CPUInfo._L1.Instruction.bPresent = true; | 1935 | CPUInfo._L1.Instruction.bPresent = true; |
| 1981 | snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", l1icachesize / 1024); /* Flawfinder: ignore */ | 1936 | snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", l1icachesize / 1024); /* Flawfinder: ignore */ |
| 1982 | // CPUInfo._L1.Instruction.uiAssociativeWays = ???; | 1937 | // CPUInfo._L1.Instruction.uiAssociativeWays = ???; |
| 1983 | CPUInfo._L1.Instruction.uiLineSize = cachelinesize; | 1938 | CPUInfo._L1.Instruction.uiLineSize = cachelinesize; |
| 1984 | } | 1939 | } |
| @@ -1986,7 +1941,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1986 | if(l2cachesize != 0) | 1941 | if(l2cachesize != 0) |
| 1987 | { | 1942 | { |
| 1988 | CPUInfo._L2.bPresent = true; | 1943 | CPUInfo._L2.bPresent = true; |
| 1989 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l2cachesize / 1024); /* Flawfinder: ignore */ | 1944 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l2cachesize / 1024); /* Flawfinder: ignore */ |
| 1990 | // CPUInfo._L2.uiAssociativeWays = ???; | 1945 | // CPUInfo._L2.uiAssociativeWays = ???; |
| 1991 | CPUInfo._L2.uiLineSize = cachelinesize; | 1946 | CPUInfo._L2.uiLineSize = cachelinesize; |
| 1992 | } | 1947 | } |
| @@ -1994,7 +1949,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo() | |||
| 1994 | if(l3cachesize != 0) | 1949 | if(l3cachesize != 0) |
| 1995 | { | 1950 | { |
| 1996 | CPUInfo._L2.bPresent = true; | 1951 | CPUInfo._L2.bPresent = true; |
| 1997 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l3cachesize / 1024); /* Flawfinder: ignore */ | 1952 | snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l3cachesize / 1024); /* Flawfinder: ignore */ |
| 1998 | // CPUInfo._L2.uiAssociativeWays = ???; | 1953 | // CPUInfo._L2.uiAssociativeWays = ???; |
| 1999 | CPUInfo._L2.uiLineSize = cachelinesize; | 1954 | CPUInfo._L2.uiLineSize = cachelinesize; |
| 2000 | } | 1955 | } |
diff --git a/linden/indra/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h index cbadb42..fd9a5da 100644 --- a/linden/indra/llcommon/llprocessor.h +++ b/linden/indra/llcommon/llprocessor.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h index df56556..f695f88 100644 --- a/linden/indra/llcommon/llptrskiplist.h +++ b/linden/indra/llcommon/llptrskiplist.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llptrskipmap.h b/linden/indra/llcommon/llptrskipmap.h index c4e131f..e2fdc7f 100644 --- a/linden/indra/llcommon/llptrskipmap.h +++ b/linden/indra/llcommon/llptrskipmap.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2003-2007, Linden Research, Inc. | 6 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llqueuedthread.cpp b/linden/indra/llcommon/llqueuedthread.cpp index 2e4324b..7eaaf68 100644 --- a/linden/indra/llcommon/llqueuedthread.cpp +++ b/linden/indra/llcommon/llqueuedthread.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004-2007, Linden Research, Inc. | 4 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llqueuedthread.h b/linden/indra/llcommon/llqueuedthread.h index 7231285..18a44c5 100644 --- a/linden/indra/llcommon/llqueuedthread.h +++ b/linden/indra/llcommon/llqueuedthread.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llrun.cpp b/linden/indra/llcommon/llrun.cpp index 6cdae74..131030e 100644 --- a/linden/indra/llcommon/llrun.cpp +++ b/linden/indra/llcommon/llrun.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llrun.h b/linden/indra/llcommon/llrun.h index 696a226..649c7b0 100644 --- a/linden/indra/llcommon/llrun.h +++ b/linden/indra/llcommon/llrun.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp index 342e356..376a0de 100644 --- a/linden/indra/llcommon/llsd.cpp +++ b/linden/indra/llcommon/llsd.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h index 625b480..bd24ecf 100644 --- a/linden/indra/llcommon/llsd.h +++ b/linden/indra/llcommon/llsd.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp index 653fc66..d262ca1 100644 --- a/linden/indra/llcommon/llsdserialize.cpp +++ b/linden/indra/llcommon/llsdserialize.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsdserialize.h b/linden/indra/llcommon/llsdserialize.h index 76c65c2..4a73b60 100644 --- a/linden/indra/llcommon/llsdserialize.h +++ b/linden/indra/llcommon/llsdserialize.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp index bb36fa7..04cdd57 100644 --- a/linden/indra/llcommon/llsdserialize_xml.cpp +++ b/linden/indra/llcommon/llsdserialize_xml.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 5 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -253,7 +254,7 @@ public: | |||
| 253 | Impl(); | 254 | Impl(); |
| 254 | ~Impl(); | 255 | ~Impl(); |
| 255 | 256 | ||
| 256 | LLSD parse(std::istream& input); | 257 | S32 parse(std::istream& input, LLSD& data); |
| 257 | 258 | ||
| 258 | void parsePart(const char *buf, int len); | 259 | void parsePart(const char *buf, int len); |
| 259 | 260 | ||
| @@ -355,7 +356,7 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize) | |||
| 355 | return count; | 356 | return count; |
| 356 | } | 357 | } |
| 357 | 358 | ||
| 358 | LLSD LLSDXMLParser::Impl::parse(std::istream& input) | 359 | S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) |
| 359 | { | 360 | { |
| 360 | reset(); | 361 | reset(); |
| 361 | XML_Status status; | 362 | XML_Status status; |
| @@ -399,11 +400,13 @@ LLSD LLSDXMLParser::Impl::parse(std::istream& input) | |||
| 399 | { | 400 | { |
| 400 | ((char*) buffer)[count? count - 1 : 0] = '\0'; | 401 | ((char*) buffer)[count? count - 1 : 0] = '\0'; |
| 401 | llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl; | 402 | llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl; |
| 402 | return LLSD(); | 403 | data = LLSD(); |
| 404 | return -1; | ||
| 403 | } | 405 | } |
| 404 | 406 | ||
| 405 | clear_eol(input); | 407 | clear_eol(input); |
| 406 | return mResult; | 408 | data = mResult; |
| 409 | return 1; | ||
| 407 | } | 410 | } |
| 408 | 411 | ||
| 409 | void LLSDXMLParser::Impl::reset() | 412 | void LLSDXMLParser::Impl::reset() |
| @@ -722,6 +725,5 @@ void LLSDXMLParser::parsePart(const char *buf, int len) | |||
| 722 | // virtual | 725 | // virtual |
| 723 | S32 LLSDXMLParser::parse(std::istream& input, LLSD& data) const | 726 | S32 LLSDXMLParser::parse(std::istream& input, LLSD& data) const |
| 724 | { | 727 | { |
| 725 | data = impl.parse(input); | 728 | return impl.parse(input, data); |
| 726 | return 0; | ||
| 727 | } | 729 | } |
diff --git a/linden/indra/llcommon/llsdserialize_xml.h b/linden/indra/llcommon/llsdserialize_xml.h index 0450acb..0546ea4 100644 --- a/linden/indra/llcommon/llsdserialize_xml.h +++ b/linden/indra/llcommon/llsdserialize_xml.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 5 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp index 0f295a1..d30afc7 100644 --- a/linden/indra/llcommon/llsdutil.cpp +++ b/linden/indra/llcommon/llsdutil.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -40,7 +41,7 @@ | |||
| 40 | # include <arpa/inet.h> | 41 | # include <arpa/inet.h> |
| 41 | #endif | 42 | #endif |
| 42 | 43 | ||
| 43 | 44 | #include "llsdserialize.h" | |
| 44 | 45 | ||
| 45 | // vector3 | 46 | // vector3 |
| 46 | LLSD ll_sd_from_vector3(const LLVector3& vec) | 47 | LLSD ll_sd_from_vector3(const LLVector3& vec) |
| @@ -61,6 +62,27 @@ LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index) | |||
| 61 | return rv; | 62 | return rv; |
| 62 | } | 63 | } |
| 63 | 64 | ||
| 65 | // vector4 | ||
| 66 | LLSD ll_sd_from_vector4(const LLVector4& vec) | ||
| 67 | { | ||
| 68 | LLSD rv; | ||
| 69 | rv.append((F64)vec.mV[VX]); | ||
| 70 | rv.append((F64)vec.mV[VY]); | ||
| 71 | rv.append((F64)vec.mV[VZ]); | ||
| 72 | rv.append((F64)vec.mV[VW]); | ||
| 73 | return rv; | ||
| 74 | } | ||
| 75 | |||
| 76 | LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index) | ||
| 77 | { | ||
| 78 | LLVector4 rv; | ||
| 79 | rv.mV[VX] = (F32)sd[start_index].asReal(); | ||
| 80 | rv.mV[VY] = (F32)sd[++start_index].asReal(); | ||
| 81 | rv.mV[VZ] = (F32)sd[++start_index].asReal(); | ||
| 82 | rv.mV[VW] = (F32)sd[++start_index].asReal(); | ||
| 83 | return rv; | ||
| 84 | } | ||
| 85 | |||
| 64 | // vector3d | 86 | // vector3d |
| 65 | LLSD ll_sd_from_vector3d(const LLVector3d& vec) | 87 | LLSD ll_sd_from_vector3d(const LLVector3d& vec) |
| 66 | { | 88 | { |
| @@ -227,9 +249,39 @@ U32 ll_ipaddr_from_sd(const LLSD& sd) | |||
| 227 | LLSD ll_string_from_binary(const LLSD& sd) | 249 | LLSD ll_string_from_binary(const LLSD& sd) |
| 228 | { | 250 | { |
| 229 | std::vector<U8> value = sd.asBinary(); | 251 | std::vector<U8> value = sd.asBinary(); |
| 230 | char* c_str = new char[value.size() + 1]; | 252 | std::string str; |
| 231 | memcpy(c_str, &value[0], value.size()); | 253 | str.resize(value.size()); |
| 232 | c_str[value.size()] = '\0'; | 254 | memcpy(&str[0], &value[0], value.size()); |
| 255 | return str; | ||
| 256 | } | ||
| 233 | 257 | ||
| 234 | return c_str; | 258 | // Converts an LLSD string to an LLSD binary |
| 259 | LLSD ll_binary_from_string(const LLSD& sd) | ||
| 260 | { | ||
| 261 | std::vector<U8> binary_value; | ||
| 262 | |||
| 263 | LLString string_value = sd.asString(); | ||
| 264 | const char* string_p = string_value.c_str(); | ||
| 265 | while (*string_p) | ||
| 266 | { | ||
| 267 | binary_value.push_back(*string_p); | ||
| 268 | string_p++; | ||
| 269 | } | ||
| 270 | |||
| 271 | binary_value.push_back('\0'); | ||
| 272 | |||
| 273 | return binary_value; | ||
| 274 | } | ||
| 275 | |||
| 276 | char* ll_print_sd(const LLSD& sd) | ||
| 277 | { | ||
| 278 | const U32 bufferSize = 10 * 1024; | ||
| 279 | static char buffer[bufferSize]; | ||
| 280 | std::ostringstream stream; | ||
| 281 | //stream.rdbuf()->pubsetbuf(buffer, bufferSize); | ||
| 282 | stream << LLSDOStreamer<LLSDXMLFormatter>(sd); | ||
| 283 | stream << std::ends; | ||
| 284 | strncpy(buffer, stream.str().c_str(), bufferSize); | ||
| 285 | buffer[bufferSize - 1] = '\0'; | ||
| 286 | return buffer; | ||
| 235 | } | 287 | } |
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h index ca6b76f..6344c50 100644 --- a/linden/indra/llcommon/llsdutil.h +++ b/linden/indra/llcommon/llsdutil.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -32,6 +33,7 @@ | |||
| 32 | 33 | ||
| 33 | #include "llsd.h" | 34 | #include "llsd.h" |
| 34 | #include "../llmath/v3math.h" | 35 | #include "../llmath/v3math.h" |
| 36 | #include "../llmath/v4math.h" | ||
| 35 | #include "../llmath/v3dmath.h" | 37 | #include "../llmath/v3dmath.h" |
| 36 | #include "../llmath/v2math.h" | 38 | #include "../llmath/v2math.h" |
| 37 | #include "../llmath/llquaternion.h" | 39 | #include "../llmath/llquaternion.h" |
| @@ -42,6 +44,10 @@ | |||
| 42 | LLSD ll_sd_from_vector3(const LLVector3& vec); | 44 | LLSD ll_sd_from_vector3(const LLVector3& vec); |
| 43 | LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0); | 45 | LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0); |
| 44 | 46 | ||
| 47 | // vector4 | ||
| 48 | LLSD ll_sd_from_vector4(const LLVector4& vec); | ||
| 49 | LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0); | ||
| 50 | |||
| 45 | // vector3d (double) | 51 | // vector3d (double) |
| 46 | LLSD ll_sd_from_vector3d(const LLVector3d& vec); | 52 | LLSD ll_sd_from_vector3d(const LLVector3d& vec); |
| 47 | LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0); | 53 | LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0); |
| @@ -73,4 +79,10 @@ U32 ll_ipaddr_from_sd(const LLSD& sd); | |||
| 73 | // Binary to string | 79 | // Binary to string |
| 74 | LLSD ll_string_from_binary(const LLSD& sd); | 80 | LLSD ll_string_from_binary(const LLSD& sd); |
| 75 | 81 | ||
| 82 | //String to binary | ||
| 83 | LLSD ll_binary_from_string(const LLSD& sd); | ||
| 84 | |||
| 85 | // Serializes sd to static buffer and returns pointer, useful for gdb debugging. | ||
| 86 | char* ll_print_sd(const LLSD& sd); | ||
| 87 | |||
| 76 | #endif // LL_LLSDUTIL_H | 88 | #endif // LL_LLSDUTIL_H |
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp index 4372373..53a1906 100644 --- a/linden/indra/llcommon/llsecondlifeurls.cpp +++ b/linden/indra/llcommon/llsecondlifeurls.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h index 1f7d359..d4d296b 100644 --- a/linden/indra/llcommon/llsecondlifeurls.h +++ b/linden/indra/llcommon/llsecondlifeurls.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsimplehash.h b/linden/indra/llcommon/llsimplehash.h index 259f140..4e0d5ea 100644 --- a/linden/indra/llcommon/llsimplehash.h +++ b/linden/indra/llcommon/llsimplehash.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2003-2007, Linden Research, Inc. | 4 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h index bd28cea..be3385d 100644 --- a/linden/indra/llcommon/llskiplist.h +++ b/linden/indra/llcommon/llskiplist.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llskipmap.h b/linden/indra/llcommon/llskipmap.h index 85a84e5..c2c0092 100644 --- a/linden/indra/llcommon/llskipmap.h +++ b/linden/indra/llcommon/llskipmap.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstack.h b/linden/indra/llcommon/llstack.h index b3bb81f..36c2e1e 100644 --- a/linden/indra/llcommon/llstack.h +++ b/linden/indra/llcommon/llstack.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp index 61893e2..4e43923 100644 --- a/linden/indra/llcommon/llstat.cpp +++ b/linden/indra/llcommon/llstat.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2007, Linden Research, Inc. | 4 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -118,8 +119,9 @@ void LLStatAccum::impl::sum(F64 value, U64 when) | |||
| 118 | } | 119 | } |
| 119 | if (when < mLastTime) | 120 | if (when < mLastTime) |
| 120 | { | 121 | { |
| 121 | llwarns << "LLStatAccum::sum clock has gone backwards from " | 122 | // JAMESDEBUG spams on Athlon |
| 122 | << mLastTime << " to " << when << ", resetting" << llendl; | 123 | //llwarns << "LLStatAccum::sum clock has gone backwards from " |
| 124 | // << mLastTime << " to " << when << ", resetting" << llendl; | ||
| 123 | 125 | ||
| 124 | reset(when); | 126 | reset(when); |
| 125 | return; | 127 | return; |
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h index 09b6028..9266b60 100644 --- a/linden/indra/llcommon/llstat.h +++ b/linden/indra/llcommon/llstat.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h index 6860ca0..fc618df 100644 --- a/linden/indra/llcommon/llstatenums.h +++ b/linden/indra/llcommon/llstatenums.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2007, Linden Research, Inc. | 4 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h index ae0dc25..06980a1 100644 --- a/linden/indra/llcommon/llstl.h +++ b/linden/indra/llcommon/llstl.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp index 2c78e05..d70fa60 100644 --- a/linden/indra/llcommon/llstreamtools.cpp +++ b/linden/indra/llcommon/llstreamtools.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h index cd92911..c339dde 100644 --- a/linden/indra/llcommon/llstreamtools.h +++ b/linden/indra/llcommon/llstreamtools.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2005-2007, Linden Research, Inc. | 5 | * Copyright (c) 2005-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstrider.h b/linden/indra/llcommon/llstrider.h index efc2ae4..707d10e 100644 --- a/linden/indra/llcommon/llstrider.h +++ b/linden/indra/llcommon/llstrider.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2007, Linden Research, Inc. | 4 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp index c9f684f..22d7b47 100644 --- a/linden/indra/llcommon/llstring.cpp +++ b/linden/indra/llcommon/llstring.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -673,6 +674,33 @@ std::string mbcsstring_makeASCII(const std::string& wstr) | |||
| 673 | return out_str; | 674 | return out_str; |
| 674 | } | 675 | } |
| 675 | 676 | ||
| 677 | #if LL_WINDOWS | ||
| 678 | /* If the size of the passed in buffer is not large enough to hold the string, | ||
| 679 | * two bad things happen: | ||
| 680 | * 1. resulting formatted string is NOT null terminated | ||
| 681 | * 2. Depending on the platform, the return value could be a) the required | ||
| 682 | * size of the buffer to copy the entire formatted string or b) -1. | ||
| 683 | * On Windows with VS.Net 2003, it returns -1 e.g. | ||
| 684 | * | ||
| 685 | * safe_snprintf always adds a NULL terminator so that the caller does not | ||
| 686 | * need to check for return value or need to add the NULL terminator. | ||
| 687 | * It does not, however change the return value - to let the caller know | ||
| 688 | * that the passed in buffer size was not large enough to hold the formatted string. | ||
| 689 | * | ||
| 690 | */ | ||
| 691 | int safe_snprintf(char *str, size_t size, const char *format, ...) | ||
| 692 | { | ||
| 693 | va_list args; | ||
| 694 | va_start(args, format); | ||
| 695 | |||
| 696 | int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */ | ||
| 697 | va_end(args); | ||
| 698 | |||
| 699 | str[size-1] = '\0'; // always null terminate | ||
| 700 | return num_written; | ||
| 701 | } | ||
| 702 | #endif // LL_WINDOWS | ||
| 703 | |||
| 676 | S32 LLStringOps::collate(const llwchar* a, const llwchar* b) | 704 | S32 LLStringOps::collate(const llwchar* a, const llwchar* b) |
| 677 | { | 705 | { |
| 678 | #if LL_WINDOWS | 706 | #if LL_WINDOWS |
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h index 0485a1e..d901e61 100644 --- a/linden/indra/llcommon/llstring.h +++ b/linden/indra/llcommon/llstring.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -38,6 +39,7 @@ | |||
| 38 | #include <stdlib.h> | 39 | #include <stdlib.h> |
| 39 | #include <errno.h> | 40 | #include <errno.h> |
| 40 | #include <math.h> | 41 | #include <math.h> |
| 42 | #include <stdarg.h> /* for vsnprintf */ | ||
| 41 | #if LL_LINUX | 43 | #if LL_LINUX |
| 42 | #include <wctype.h> | 44 | #include <wctype.h> |
| 43 | #include <wchar.h> | 45 | #include <wchar.h> |
| @@ -464,6 +466,9 @@ std::ostream& operator<<(std::ostream &s, const LLStringBase<T> &str) | |||
| 464 | 466 | ||
| 465 | std::ostream& operator<<(std::ostream &s, const LLWString &wstr); | 467 | std::ostream& operator<<(std::ostream &s, const LLWString &wstr); |
| 466 | 468 | ||
| 469 | #if LL_WINDOWS | ||
| 470 | int safe_snprintf(char *str, size_t size, const char *format, ...); | ||
| 471 | #endif // LL_WINDOWS | ||
| 467 | 472 | ||
| 468 | /** | 473 | /** |
| 469 | * Many of the 'strip' and 'replace' methods of LLStringBase need | 474 | * Many of the 'strip' and 'replace' methods of LLStringBase need |
diff --git a/linden/indra/llcommon/llstringtable.cpp b/linden/indra/llcommon/llstringtable.cpp index 4a76ed6..30db4f7 100644 --- a/linden/indra/llcommon/llstringtable.cpp +++ b/linden/indra/llcommon/llstringtable.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 6 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h index ddfef88..337d937 100644 --- a/linden/indra/llcommon/llstringtable.h +++ b/linden/indra/llcommon/llstringtable.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 6 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | ||
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp index 906bc65..48f2474 100644 --- a/linden/indra/llcommon/llsys.cpp +++ b/linden/indra/llcommon/llsys.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -31,6 +32,7 @@ | |||
| 31 | 32 | ||
| 32 | #include <iostream> | 33 | #include <iostream> |
| 33 | #include <zlib/zlib.h> | 34 | #include <zlib/zlib.h> |
| 35 | |||
| 34 | #include "processor.h" | 36 | #include "processor.h" |
| 35 | 37 | ||
| 36 | #if LL_WINDOWS | 38 | #if LL_WINDOWS |
| @@ -143,7 +145,7 @@ LLOSInfo::LLOSInfo() : | |||
| 143 | } | 145 | } |
| 144 | else | 146 | else |
| 145 | { | 147 | { |
| 146 | snprintf( /* Flawfinder: ignore */ | 148 | snprintf( /* Flawfinder: ignore */ |
| 147 | tmp, | 149 | tmp, |
| 148 | sizeof(tmp), | 150 | sizeof(tmp), |
| 149 | "%s (Build %d)", | 151 | "%s (Build %d)", |
| @@ -308,50 +310,28 @@ LLCPUInfo::LLCPUInfo() | |||
| 308 | mFamily.assign( info->strFamily ); | 310 | mFamily.assign( info->strFamily ); |
| 309 | } | 311 | } |
| 310 | 312 | ||
| 313 | |||
| 311 | std::string LLCPUInfo::getCPUString() const | 314 | std::string LLCPUInfo::getCPUString() const |
| 312 | { | 315 | { |
| 313 | std::string cpu_string; | ||
| 314 | |||
| 315 | #if LL_WINDOWS || LL_DARWIN | 316 | #if LL_WINDOWS || LL_DARWIN |
| 316 | // gather machine information. | 317 | std::ostringstream out; |
| 317 | char proc_buf[CPUINFO_BUFFER_SIZE]; /* Flawfinder: ignore */ | ||
| 318 | CProcessor proc; | ||
| 319 | if(proc.CPUInfoToText(proc_buf, CPUINFO_BUFFER_SIZE)) | ||
| 320 | { | ||
| 321 | cpu_string.append(proc_buf); | ||
| 322 | } | ||
| 323 | #else | ||
| 324 | cpu_string.append("Can't get CPU information"); | ||
| 325 | #endif | ||
| 326 | |||
| 327 | return cpu_string; | ||
| 328 | } | ||
| 329 | |||
| 330 | std::string LLCPUInfo::getCPUStringTerse() const | ||
| 331 | { | ||
| 332 | std::string cpu_string; | ||
| 333 | 318 | ||
| 334 | #if LL_WINDOWS || LL_DARWIN | ||
| 335 | CProcessor proc; | 319 | CProcessor proc; |
| 336 | const ProcessorInfo *info = proc.GetCPUInfo(); | 320 | (void) proc.GetCPUInfo(); |
| 337 | 321 | out << proc.strCPUName << " "; | |
| 338 | cpu_string.append(info->strBrandID); | ||
| 339 | 322 | ||
| 340 | F64 freq = (F64)(S64)proc.GetCPUFrequency(50) / 1000000.f; | 323 | F32 freq = (F32)(proc.GetCPUFrequency(50) / 1000000.0); |
| 341 | 324 | ||
| 342 | // cpu speed is often way wrong, do a sanity check | 325 | // cpu speed is often way wrong, do a sanity check |
| 343 | if (freq < 10000.f && freq > 200.f ) | 326 | if (200.f < freq && freq < 10000.f) |
| 344 | { | 327 | { |
| 345 | char tmp[MAX_STRING]; /* Flawfinder: ignore */ | 328 | out << "(" << (S32)(freq) << " MHz)"; |
| 346 | snprintf(tmp, sizeof(tmp), " (%.0f Mhz)", freq); /* Flawfinder: ignore */ | ||
| 347 | |||
| 348 | cpu_string.append(tmp); | ||
| 349 | } | 329 | } |
| 330 | |||
| 331 | return out.str(); | ||
| 350 | #else | 332 | #else |
| 351 | cpu_string.append("Can't get terse CPU information"); | 333 | return "Can't get terse CPU information"; |
| 352 | #endif | 334 | #endif |
| 353 | |||
| 354 | return cpu_string; | ||
| 355 | } | 335 | } |
| 356 | 336 | ||
| 357 | void LLCPUInfo::stream(std::ostream& s) const | 337 | void LLCPUInfo::stream(std::ostream& s) const |
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h index 7753adb..2047d9a 100644 --- a/linden/indra/llcommon/llsys.h +++ b/linden/indra/llcommon/llsys.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -70,7 +71,6 @@ public: | |||
| 70 | void stream(std::ostream& s) const; | 71 | void stream(std::ostream& s) const; |
| 71 | 72 | ||
| 72 | std::string getCPUString() const; | 73 | std::string getCPUString() const; |
| 73 | std::string getCPUStringTerse() const; | ||
| 74 | 74 | ||
| 75 | BOOL hasSSE() const { return mHasSSE; } | 75 | BOOL hasSSE() const { return mHasSSE; } |
| 76 | BOOL hasSSE2() const { return mHasSSE2; } | 76 | BOOL hasSSE2() const { return mHasSSE2; } |
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp index d6b52f7..0f833ab 100644 --- a/linden/indra/llcommon/llthread.cpp +++ b/linden/indra/llcommon/llthread.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004-2007, Linden Research, Inc. | 4 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h index cdf1d33..adb04a5 100644 --- a/linden/indra/llcommon/llthread.h +++ b/linden/indra/llcommon/llthread.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp index 07bd543..21fbf0e 100644 --- a/linden/indra/llcommon/lltimer.cpp +++ b/linden/indra/llcommon/lltimer.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h index caac16f..94dcbb9 100644 --- a/linden/indra/llcommon/lltimer.h +++ b/linden/indra/llcommon/lltimer.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp index bc3540e..f85f294 100644 --- a/linden/indra/llcommon/lluri.cpp +++ b/linden/indra/llcommon/lluri.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -214,6 +215,19 @@ LLURI LLURI::buildHTTP(const std::string& prefix, | |||
| 214 | result.mEscapedPath += "/" + escapePathComponent(it->asString()); | 215 | result.mEscapedPath += "/" + escapePathComponent(it->asString()); |
| 215 | } | 216 | } |
| 216 | } | 217 | } |
| 218 | else if(path.isString()) | ||
| 219 | { | ||
| 220 | result.mEscapedPath += "/" + escapePathComponent(path.asString()); | ||
| 221 | } | ||
| 222 | else if(path.isUndefined()) | ||
| 223 | { | ||
| 224 | // do nothing | ||
| 225 | } | ||
| 226 | else | ||
| 227 | { | ||
| 228 | llwarns << "Valid path arguments to buildHTTP are array, string, or undef, you passed type" | ||
| 229 | << path.type() << llendl; | ||
| 230 | } | ||
| 217 | result.mEscapedOpaque = "//" + result.mEscapedAuthority + | 231 | result.mEscapedOpaque = "//" + result.mEscapedAuthority + |
| 218 | result.mEscapedPath; | 232 | result.mEscapedPath; |
| 219 | return result; | 233 | return result; |
| @@ -284,19 +298,7 @@ namespace { | |||
| 284 | } | 298 | } |
| 285 | } | 299 | } |
| 286 | 300 | ||
| 287 | 301 | #if LL_ENABLE_JANKY_DEPRECATED_WEB_SERVICE_CALLS | |
| 288 | // static | ||
| 289 | LLURI LLURI::buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app) | ||
| 290 | { | ||
| 291 | return buildBackboneURL(app, "agent", agent_id.asString(), "presence"); | ||
| 292 | } | ||
| 293 | |||
| 294 | // static | ||
| 295 | LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app) | ||
| 296 | { | ||
| 297 | return buildBackboneURL(app, "agent", "presence"); | ||
| 298 | } | ||
| 299 | |||
| 300 | // static | 302 | // static |
| 301 | LLURI LLURI::buildBulkAgentNamesURI(LLApp* app) | 303 | LLURI LLURI::buildBulkAgentNamesURI(LLApp* app) |
| 302 | { | 304 | { |
| @@ -321,25 +323,6 @@ LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app) | |||
| 321 | } | 323 | } |
| 322 | 324 | ||
| 323 | // static | 325 | // static |
| 324 | LLURI LLURI::buildInventoryHostURI(const LLUUID& agent_id, LLApp* app) | ||
| 325 | { | ||
| 326 | std::string host = "localhost:12040"; | ||
| 327 | |||
| 328 | if (app) | ||
| 329 | { | ||
| 330 | host = app->getOption("backbone-host-port").asString(); | ||
| 331 | } | ||
| 332 | |||
| 333 | LLSD path = LLSD::emptyArray(); | ||
| 334 | path.append("agent"); | ||
| 335 | path.append(agent_id); | ||
| 336 | path.append("inventory"); | ||
| 337 | path.append("host"); | ||
| 338 | |||
| 339 | return buildHTTP(host, path); | ||
| 340 | } | ||
| 341 | |||
| 342 | // static | ||
| 343 | LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app) | 326 | LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app) |
| 344 | { | 327 | { |
| 345 | std::string host = "localhost:12040"; | 328 | std::string host = "localhost:12040"; |
| @@ -367,6 +350,7 @@ LLURI LLURI::buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& d | |||
| 367 | 350 | ||
| 368 | return buildHTTP(dataserver, path); | 351 | return buildHTTP(dataserver, path); |
| 369 | } | 352 | } |
| 353 | #endif // LL_ENABLE_JANKY_DEPRECATED_WEB_SERVICE_CALLS | ||
| 370 | 354 | ||
| 371 | std::string LLURI::asString() const | 355 | std::string LLURI::asString() const |
| 372 | { | 356 | { |
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h index 60b3d48..77de595 100644 --- a/linden/indra/llcommon/lluri.h +++ b/linden/indra/llcommon/lluri.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -96,13 +97,12 @@ public: | |||
| 96 | static std::string unescape(const std::string& str); | 97 | static std::string unescape(const std::string& str); |
| 97 | 98 | ||
| 98 | // Functions for building specific URIs for web services | 99 | // Functions for building specific URIs for web services |
| 99 | static LLURI buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app); | 100 | // *NOTE: DEPRECATED. use the service builder instead. |
| 100 | static LLURI buildBulkAgentPresenceURI(LLApp* app); | 101 | //static LLURI buildBulkAgentNamesURI(LLApp* app); |
| 101 | static LLURI buildBulkAgentNamesURI(LLApp* app); | 102 | //static LLURI buildAgentSessionURI(const LLUUID& agent_id, LLApp* app); |
| 102 | static LLURI buildAgentSessionURI(const LLUUID& agent_id, LLApp* app); | 103 | //static LLURI buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver); |
| 103 | static LLURI buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver); | 104 | //static LLURI buildAgentNameURI(const LLUUID& agent_id, LLApp* app); |
| 104 | static LLURI buildInventoryHostURI(const LLUUID& agent_id, LLApp* app); | 105 | |
| 105 | static LLURI buildAgentNameURI(const LLUUID& agent_id, LLApp* app); | ||
| 106 | private: | 106 | private: |
| 107 | std::string mScheme; | 107 | std::string mScheme; |
| 108 | std::string mEscapedOpaque; | 108 | std::string mEscapedOpaque; |
diff --git a/linden/indra/llcommon/lluuidhashmap.h b/linden/indra/llcommon/lluuidhashmap.h index 44cd925..77609e0 100644 --- a/linden/indra/llcommon/lluuidhashmap.h +++ b/linden/indra/llcommon/lluuidhashmap.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 5 | * Copyright (c) 2003-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -225,7 +226,7 @@ inline S32 LLUUIDHashMap<DATA_TYPE, SIZE>::getLength() const | |||
| 225 | S32 bin; | 226 | S32 bin; |
| 226 | for (bin = 0; bin < 256; bin++) | 227 | for (bin = 0; bin < 256; bin++) |
| 227 | { | 228 | { |
| 228 | LLUUIDHashNode<DATA_TYPE, SIZE>* nodep = &mNodes[bin]; | 229 | LLUUIDHashNode<DATA_TYPE, SIZE>* nodep = (LLUUIDHashNode<DATA_TYPE, SIZE>*) &mNodes[bin]; |
| 229 | while (nodep) | 230 | while (nodep) |
| 230 | { | 231 | { |
| 231 | count += nodep->mCount; | 232 | count += nodep->mCount; |
| @@ -440,6 +441,7 @@ public: | |||
| 440 | ~LLUUIDHashMapIter(); | 441 | ~LLUUIDHashMapIter(); |
| 441 | 442 | ||
| 442 | 443 | ||
| 444 | inline void reset(); | ||
| 443 | inline void first(); | 445 | inline void first(); |
| 444 | inline void next(); | 446 | inline void next(); |
| 445 | inline BOOL done() const; | 447 | inline BOOL done() const; |
| @@ -479,10 +481,17 @@ LLUUIDHashMapIter<DATA_TYPE, SIZE>::LLUUIDHashMapIter(LLUUIDHashMap<DATA_TYPE, S | |||
| 479 | template <class DATA_TYPE, int SIZE> | 481 | template <class DATA_TYPE, int SIZE> |
| 480 | LLUUIDHashMapIter<DATA_TYPE, SIZE>::~LLUUIDHashMapIter() | 482 | LLUUIDHashMapIter<DATA_TYPE, SIZE>::~LLUUIDHashMapIter() |
| 481 | { | 483 | { |
| 484 | reset(); | ||
| 485 | } | ||
| 486 | |||
| 487 | template <class DATA_TYPE, int SIZE> | ||
| 488 | inline void LLUUIDHashMapIter<DATA_TYPE, SIZE>::reset() | ||
| 489 | { | ||
| 482 | if (mCurHashNodep) | 490 | if (mCurHashNodep) |
| 483 | { | 491 | { |
| 484 | // We're partway through an iteration, we can clean up now | 492 | // We're partway through an iteration, we can clean up now |
| 485 | mHashMapp->mIterCount--; | 493 | mHashMapp->mIterCount--; |
| 494 | mCurHashNodep = NULL; | ||
| 486 | } | 495 | } |
| 487 | } | 496 | } |
| 488 | 497 | ||
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h index a3e5152..426eff0 100644 --- a/linden/indra/llcommon/llversion.h +++ b/linden/indra/llcommon/llversion.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -28,14 +29,9 @@ | |||
| 28 | #ifndef LL_LLVERSION_H | 29 | #ifndef LL_LLVERSION_H |
| 29 | #define LL_LLVERSION_H | 30 | #define LL_LLVERSION_H |
| 30 | 31 | ||
| 31 | // Branch "release" | ||
| 32 | |||
| 33 | // MUST ALSO change version number in secondlife setup.nsi | ||
| 34 | const S32 LL_VERSION_MAJOR = 1; | 32 | const S32 LL_VERSION_MAJOR = 1; |
| 35 | const S32 LL_VERSION_MINOR = 14; | 33 | const S32 LL_VERSION_MINOR = 15; |
| 36 | const S32 LL_VERSION_PATCH = 0; | 34 | const S32 LL_VERSION_PATCH = 0; |
| 37 | const S32 LL_VERSION_BUILD = 0; | 35 | const S32 LL_VERSION_BUILD = 2; |
| 38 | |||
| 39 | |||
| 40 | 36 | ||
| 41 | #endif | 37 | #endif |
diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp index 4f99393..aa0bedf 100644 --- a/linden/indra/llcommon/llworkerthread.cpp +++ b/linden/indra/llcommon/llworkerthread.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004-2007, Linden Research, Inc. | 4 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h index 17b7e7b..278f8e0 100644 --- a/linden/indra/llcommon/llworkerthread.h +++ b/linden/indra/llcommon/llworkerthread.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004-2007, Linden Research, Inc. | 4 | * Copyright (c) 2004-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
| @@ -90,7 +91,7 @@ public: | |||
| 90 | handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL); | 91 | handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL); |
| 91 | 92 | ||
| 92 | void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion | 93 | void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion |
| 93 | S32 getNumDeletes() { return mDeleteList.size(); } // debug | 94 | S32 getNumDeletes() { return (S32)mDeleteList.size(); } // debug |
| 94 | }; | 95 | }; |
| 95 | 96 | ||
| 96 | //============================================================================ | 97 | //============================================================================ |
diff --git a/linden/indra/llcommon/metaclass.cpp b/linden/indra/llcommon/metaclass.cpp index f83a044..251795e 100644 --- a/linden/indra/llcommon/metaclass.cpp +++ b/linden/indra/llcommon/metaclass.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/metaclass.h b/linden/indra/llcommon/metaclass.h index 091f83c..1e255b0 100644 --- a/linden/indra/llcommon/metaclass.h +++ b/linden/indra/llcommon/metaclass.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/metaclasst.h b/linden/indra/llcommon/metaclasst.h index 81748b9..5a110ba 100644 --- a/linden/indra/llcommon/metaclasst.h +++ b/linden/indra/llcommon/metaclasst.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp index 312dd9d..23ed7d9 100644 --- a/linden/indra/llcommon/metaproperty.cpp +++ b/linden/indra/llcommon/metaproperty.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/metaproperty.h b/linden/indra/llcommon/metaproperty.h index 08e9c59..d8272fe 100644 --- a/linden/indra/llcommon/metaproperty.h +++ b/linden/indra/llcommon/metaproperty.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/metapropertyt.h b/linden/indra/llcommon/metapropertyt.h index 6633975..1b444bd 100644 --- a/linden/indra/llcommon/metapropertyt.h +++ b/linden/indra/llcommon/metapropertyt.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/processor.h b/linden/indra/llcommon/processor.h index 6a2cdcb..367d540 100644 --- a/linden/indra/llcommon/processor.h +++ b/linden/indra/llcommon/processor.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007 Linden Research, Inc. | 5 | * Copyright (c) 2000-2007 Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/reflective.cpp b/linden/indra/llcommon/reflective.cpp index 5c6eff7..7c07d88 100644 --- a/linden/indra/llcommon/reflective.cpp +++ b/linden/indra/llcommon/reflective.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/reflective.h b/linden/indra/llcommon/reflective.h index ca698b1..10cecb0 100644 --- a/linden/indra/llcommon/reflective.h +++ b/linden/indra/llcommon/reflective.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | ||
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 10 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 11 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/reflectivet.h b/linden/indra/llcommon/reflectivet.h index 698f057..e81d76a 100644 --- a/linden/indra/llcommon/reflectivet.h +++ b/linden/indra/llcommon/reflectivet.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2006-2007, Linden Research, Inc. | 4 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 5 | * | 5 | * |
| 6 | * Second Life Viewer Source Code | ||
| 6 | * The source code in this file ("Source Code") is provided by Linden Lab | 7 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 7 | * to you under the terms of the GNU General Public License, version 2.0 | 8 | * to you under the terms of the GNU General Public License, version 2.0 |
| 8 | * ("GPL"), unless you have obtained a separate licensing agreement | 9 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h index c30048c..3c885ab 100644 --- a/linden/indra/llcommon/roles_constants.h +++ b/linden/indra/llcommon/roles_constants.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 5 | * Copyright (c) 2006-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/stdenums.h b/linden/indra/llcommon/stdenums.h index edd9048..b910570 100644 --- a/linden/indra/llcommon/stdenums.h +++ b/linden/indra/llcommon/stdenums.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h index 43f180c..16b57fa 100644 --- a/linden/indra/llcommon/stdtypes.h +++ b/linden/indra/llcommon/stdtypes.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/string_table.h b/linden/indra/llcommon/string_table.h index 3af586d..790741d 100644 --- a/linden/indra/llcommon/string_table.h +++ b/linden/indra/llcommon/string_table.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007 Linden Research, Inc. | 5 | * Copyright (c) 2000-2007 Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/timer.h b/linden/indra/llcommon/timer.h index 06c9013..31e6db6 100644 --- a/linden/indra/llcommon/timer.h +++ b/linden/indra/llcommon/timer.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007 Linden Research, Inc. | 5 | * Copyright (c) 2000-2007 Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/timing.cpp b/linden/indra/llcommon/timing.cpp index 0915c85..342bf19 100644 --- a/linden/indra/llcommon/timing.cpp +++ b/linden/indra/llcommon/timing.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007 Linden Research, Inc. | 5 | * Copyright (c) 2000-2007 Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/timing.h b/linden/indra/llcommon/timing.h index e6cc2d1..662d22b 100644 --- a/linden/indra/llcommon/timing.h +++ b/linden/indra/llcommon/timing.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 5 | * Copyright (c) 2000-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp index 744e0ab..204c6c8 100644 --- a/linden/indra/llcommon/u64.cpp +++ b/linden/indra/llcommon/u64.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
diff --git a/linden/indra/llcommon/u64.h b/linden/indra/llcommon/u64.h index e2a751e..da83e28 100644 --- a/linden/indra/llcommon/u64.h +++ b/linden/indra/llcommon/u64.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | ||
| 7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
| 9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |