diff options
Diffstat (limited to 'linden/indra/llimage')
-rw-r--r-- | linden/indra/llimage/llimage.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimage.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimage_vc9.vcproj | 326 | ||||
-rw-r--r-- | linden/indra/llimage/llimagebmp.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagebmp.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagedxt.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagedxt.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagej2c.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagej2c.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagejpeg.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagejpeg.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagepng.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagepng.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagetga.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimagetga.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimageworker.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llimageworker.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llmapimagetype.h | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llpngwrapper.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llimage/llpngwrapper.h | 4 |
20 files changed, 364 insertions, 38 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp index 414603f..b9bf26a 100644 --- a/linden/indra/llimage/llimage.cpp +++ b/linden/indra/llimage/llimage.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h index 1c85bf0..ef736ec 100644 --- a/linden/indra/llimage/llimage.h +++ b/linden/indra/llimage/llimage.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimage_vc9.vcproj b/linden/indra/llimage/llimage_vc9.vcproj new file mode 100644 index 0000000..67ff6b3 --- /dev/null +++ b/linden/indra/llimage/llimage_vc9.vcproj | |||
@@ -0,0 +1,326 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
2 | <VisualStudioProject | ||
3 | ProjectType="Visual C++" | ||
4 | Version="9.00" | ||
5 | Name="llimage" | ||
6 | ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}" | ||
7 | RootNamespace="llimage" | ||
8 | Keyword="Win32Proj" | ||
9 | TargetFrameworkVersion="131072" | ||
10 | > | ||
11 | <Platforms> | ||
12 | <Platform | ||
13 | Name="Win32" | ||
14 | /> | ||
15 | </Platforms> | ||
16 | <ToolFiles> | ||
17 | </ToolFiles> | ||
18 | <Configurations> | ||
19 | <Configuration | ||
20 | Name="Debug|Win32" | ||
21 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
22 | IntermediateDirectory="$(ConfigurationName)" | ||
23 | ConfigurationType="4" | ||
24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
25 | CharacterSet="1" | ||
26 | > | ||
27 | <Tool | ||
28 | Name="VCPreBuildEventTool" | ||
29 | /> | ||
30 | <Tool | ||
31 | Name="VCCustomBuildTool" | ||
32 | /> | ||
33 | <Tool | ||
34 | Name="VCXMLDataGeneratorTool" | ||
35 | /> | ||
36 | <Tool | ||
37 | Name="VCWebServiceProxyGeneratorTool" | ||
38 | /> | ||
39 | <Tool | ||
40 | Name="VCMIDLTool" | ||
41 | /> | ||
42 | <Tool | ||
43 | Name="VCCLCompilerTool" | ||
44 | Optimization="0" | ||
45 | AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
46 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" | ||
47 | MinimalRebuild="true" | ||
48 | BasicRuntimeChecks="3" | ||
49 | RuntimeLibrary="1" | ||
50 | StructMemberAlignment="4" | ||
51 | TreatWChar_tAsBuiltInType="false" | ||
52 | ForceConformanceInForLoopScope="true" | ||
53 | UsePrecompiledHeader="0" | ||
54 | WarningLevel="3" | ||
55 | WarnAsError="true" | ||
56 | Detect64BitPortabilityProblems="false" | ||
57 | DebugInformationFormat="4" | ||
58 | /> | ||
59 | <Tool | ||
60 | Name="VCManagedResourceCompilerTool" | ||
61 | /> | ||
62 | <Tool | ||
63 | Name="VCResourceCompilerTool" | ||
64 | /> | ||
65 | <Tool | ||
66 | Name="VCPreLinkEventTool" | ||
67 | /> | ||
68 | <Tool | ||
69 | Name="VCLibrarianTool" | ||
70 | OutputFile="$(OutDir)/llimage.lib" | ||
71 | /> | ||
72 | <Tool | ||
73 | Name="VCALinkTool" | ||
74 | /> | ||
75 | <Tool | ||
76 | Name="VCXDCMakeTool" | ||
77 | /> | ||
78 | <Tool | ||
79 | Name="VCBscMakeTool" | ||
80 | /> | ||
81 | <Tool | ||
82 | Name="VCFxCopTool" | ||
83 | /> | ||
84 | <Tool | ||
85 | Name="VCPostBuildEventTool" | ||
86 | /> | ||
87 | </Configuration> | ||
88 | <Configuration | ||
89 | Name="Release|Win32" | ||
90 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
91 | IntermediateDirectory="$(ConfigurationName)" | ||
92 | ConfigurationType="4" | ||
93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
94 | CharacterSet="1" | ||
95 | > | ||
96 | <Tool | ||
97 | Name="VCPreBuildEventTool" | ||
98 | /> | ||
99 | <Tool | ||
100 | Name="VCCustomBuildTool" | ||
101 | /> | ||
102 | <Tool | ||
103 | Name="VCXMLDataGeneratorTool" | ||
104 | /> | ||
105 | <Tool | ||
106 | Name="VCWebServiceProxyGeneratorTool" | ||
107 | /> | ||
108 | <Tool | ||
109 | Name="VCMIDLTool" | ||
110 | /> | ||
111 | <Tool | ||
112 | Name="VCCLCompilerTool" | ||
113 | AdditionalOptions="/Oy-" | ||
114 | InlineFunctionExpansion="2" | ||
115 | EnableIntrinsicFunctions="true" | ||
116 | AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
117 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | ||
118 | RuntimeLibrary="0" | ||
119 | StructMemberAlignment="0" | ||
120 | TreatWChar_tAsBuiltInType="false" | ||
121 | ForceConformanceInForLoopScope="true" | ||
122 | UsePrecompiledHeader="0" | ||
123 | WarningLevel="3" | ||
124 | WarnAsError="false" | ||
125 | Detect64BitPortabilityProblems="false" | ||
126 | DebugInformationFormat="3" | ||
127 | /> | ||
128 | <Tool | ||
129 | Name="VCManagedResourceCompilerTool" | ||
130 | /> | ||
131 | <Tool | ||
132 | Name="VCResourceCompilerTool" | ||
133 | /> | ||
134 | <Tool | ||
135 | Name="VCPreLinkEventTool" | ||
136 | /> | ||
137 | <Tool | ||
138 | Name="VCLibrarianTool" | ||
139 | OutputFile="$(OutDir)/llimage.lib" | ||
140 | /> | ||
141 | <Tool | ||
142 | Name="VCALinkTool" | ||
143 | /> | ||
144 | <Tool | ||
145 | Name="VCXDCMakeTool" | ||
146 | /> | ||
147 | <Tool | ||
148 | Name="VCBscMakeTool" | ||
149 | /> | ||
150 | <Tool | ||
151 | Name="VCFxCopTool" | ||
152 | /> | ||
153 | <Tool | ||
154 | Name="VCPostBuildEventTool" | ||
155 | /> | ||
156 | </Configuration> | ||
157 | <Configuration | ||
158 | Name="ReleaseNoOpt|Win32" | ||
159 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | ||
160 | IntermediateDirectory="$(ConfigurationName)" | ||
161 | ConfigurationType="4" | ||
162 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | ||
163 | CharacterSet="1" | ||
164 | > | ||
165 | <Tool | ||
166 | Name="VCPreBuildEventTool" | ||
167 | /> | ||
168 | <Tool | ||
169 | Name="VCCustomBuildTool" | ||
170 | /> | ||
171 | <Tool | ||
172 | Name="VCXMLDataGeneratorTool" | ||
173 | /> | ||
174 | <Tool | ||
175 | Name="VCWebServiceProxyGeneratorTool" | ||
176 | /> | ||
177 | <Tool | ||
178 | Name="VCMIDLTool" | ||
179 | /> | ||
180 | <Tool | ||
181 | Name="VCCLCompilerTool" | ||
182 | AdditionalOptions="/Oy-" | ||
183 | Optimization="0" | ||
184 | AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
185 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | ||
186 | RuntimeLibrary="0" | ||
187 | StructMemberAlignment="0" | ||
188 | TreatWChar_tAsBuiltInType="false" | ||
189 | ForceConformanceInForLoopScope="true" | ||
190 | UsePrecompiledHeader="0" | ||
191 | WarningLevel="3" | ||
192 | WarnAsError="true" | ||
193 | Detect64BitPortabilityProblems="false" | ||
194 | DebugInformationFormat="3" | ||
195 | /> | ||
196 | <Tool | ||
197 | Name="VCManagedResourceCompilerTool" | ||
198 | /> | ||
199 | <Tool | ||
200 | Name="VCResourceCompilerTool" | ||
201 | /> | ||
202 | <Tool | ||
203 | Name="VCPreLinkEventTool" | ||
204 | /> | ||
205 | <Tool | ||
206 | Name="VCLibrarianTool" | ||
207 | OutputFile="$(OutDir)/llimage.lib" | ||
208 | /> | ||
209 | <Tool | ||
210 | Name="VCALinkTool" | ||
211 | /> | ||
212 | <Tool | ||
213 | Name="VCXDCMakeTool" | ||
214 | /> | ||
215 | <Tool | ||
216 | Name="VCBscMakeTool" | ||
217 | /> | ||
218 | <Tool | ||
219 | Name="VCFxCopTool" | ||
220 | /> | ||
221 | <Tool | ||
222 | Name="VCPostBuildEventTool" | ||
223 | /> | ||
224 | </Configuration> | ||
225 | </Configurations> | ||
226 | <References> | ||
227 | </References> | ||
228 | <Files> | ||
229 | <Filter | ||
230 | Name="Source Files" | ||
231 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
232 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
233 | > | ||
234 | <File | ||
235 | RelativePath=".\llimage.cpp" | ||
236 | > | ||
237 | </File> | ||
238 | <File | ||
239 | RelativePath=".\llimagebmp.cpp" | ||
240 | > | ||
241 | </File> | ||
242 | <File | ||
243 | RelativePath=".\llimagedxt.cpp" | ||
244 | > | ||
245 | </File> | ||
246 | <File | ||
247 | RelativePath=".\llimagej2c.cpp" | ||
248 | > | ||
249 | </File> | ||
250 | <File | ||
251 | RelativePath=".\llimagejpeg.cpp" | ||
252 | > | ||
253 | </File> | ||
254 | <File | ||
255 | RelativePath=".\llimagepng.cpp" | ||
256 | > | ||
257 | </File> | ||
258 | <File | ||
259 | RelativePath=".\llimagetga.cpp" | ||
260 | > | ||
261 | </File> | ||
262 | <File | ||
263 | RelativePath=".\llimageworker.cpp" | ||
264 | > | ||
265 | </File> | ||
266 | <File | ||
267 | RelativePath=".\llpngwrapper.cpp" | ||
268 | > | ||
269 | </File> | ||
270 | </Filter> | ||
271 | <Filter | ||
272 | Name="Header Files" | ||
273 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
274 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
275 | > | ||
276 | <File | ||
277 | RelativePath=".\llimage.h" | ||
278 | > | ||
279 | </File> | ||
280 | <File | ||
281 | RelativePath=".\llimagebmp.h" | ||
282 | > | ||
283 | </File> | ||
284 | <File | ||
285 | RelativePath=".\llimageconstants.h" | ||
286 | > | ||
287 | </File> | ||
288 | <File | ||
289 | RelativePath=".\llimagedxt.h" | ||
290 | > | ||
291 | </File> | ||
292 | <File | ||
293 | RelativePath=".\llimagej2c.h" | ||
294 | > | ||
295 | </File> | ||
296 | <File | ||
297 | RelativePath=".\llimagejpeg.h" | ||
298 | > | ||
299 | </File> | ||
300 | <File | ||
301 | RelativePath=".\llimagepng.h" | ||
302 | > | ||
303 | </File> | ||
304 | <File | ||
305 | RelativePath=".\llimagetga.h" | ||
306 | > | ||
307 | </File> | ||
308 | <File | ||
309 | RelativePath=".\llimageworker.h" | ||
310 | > | ||
311 | </File> | ||
312 | <File | ||
313 | RelativePath=".\llpngwrapper.h" | ||
314 | > | ||
315 | </File> | ||
316 | </Filter> | ||
317 | <Filter | ||
318 | Name="Resource Files" | ||
319 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
320 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
321 | > | ||
322 | </Filter> | ||
323 | </Files> | ||
324 | <Globals> | ||
325 | </Globals> | ||
326 | </VisualStudioProject> | ||
diff --git a/linden/indra/llimage/llimagebmp.cpp b/linden/indra/llimage/llimagebmp.cpp index 9b4562d..5d74c3e 100644 --- a/linden/indra/llimage/llimagebmp.cpp +++ b/linden/indra/llimage/llimagebmp.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagebmp.h b/linden/indra/llimage/llimagebmp.h index c4ddc22..8c83bc5 100644 --- a/linden/indra/llimage/llimagebmp.h +++ b/linden/indra/llimage/llimagebmp.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagedxt.cpp b/linden/indra/llimage/llimagedxt.cpp index c616e62..722ac9b 100644 --- a/linden/indra/llimage/llimagedxt.cpp +++ b/linden/indra/llimage/llimagedxt.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagedxt.h b/linden/indra/llimage/llimagedxt.h index a92cbde..c795d4e 100644 --- a/linden/indra/llimage/llimagedxt.h +++ b/linden/indra/llimage/llimagedxt.h | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp index a895716..0011296 100644 --- a/linden/indra/llimage/llimagej2c.cpp +++ b/linden/indra/llimage/llimagej2c.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h index 25141d0..da844a1 100644 --- a/linden/indra/llimage/llimagej2c.h +++ b/linden/indra/llimage/llimagej2c.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp index f058cb8..0ffa838 100644 --- a/linden/indra/llimage/llimagejpeg.cpp +++ b/linden/indra/llimage/llimagejpeg.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagejpeg.h b/linden/indra/llimage/llimagejpeg.h index e35eb94..b143c47 100644 --- a/linden/indra/llimage/llimagejpeg.h +++ b/linden/indra/llimage/llimagejpeg.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagepng.cpp b/linden/indra/llimage/llimagepng.cpp index 159267c..5108066 100644 --- a/linden/indra/llimage/llimagepng.cpp +++ b/linden/indra/llimage/llimagepng.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagepng.h b/linden/indra/llimage/llimagepng.h index f2572aa..982454a 100644 --- a/linden/indra/llimage/llimagepng.h +++ b/linden/indra/llimage/llimagepng.h | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp index 37c63f8..4da374e 100644 --- a/linden/indra/llimage/llimagetga.cpp +++ b/linden/indra/llimage/llimagetga.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimagetga.h b/linden/indra/llimage/llimagetga.h index e11edf4..475ffed 100644 --- a/linden/indra/llimage/llimagetga.h +++ b/linden/indra/llimage/llimagetga.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp index dfb067b..2800caf 100644 --- a/linden/indra/llimage/llimageworker.cpp +++ b/linden/indra/llimage/llimageworker.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h index c838f93..bf6c3f2 100644 --- a/linden/indra/llimage/llimageworker.h +++ b/linden/indra/llimage/llimageworker.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llmapimagetype.h b/linden/indra/llimage/llmapimagetype.h index 7031eca..156700f 100644 --- a/linden/indra/llimage/llmapimagetype.h +++ b/linden/indra/llimage/llmapimagetype.h | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llpngwrapper.cpp b/linden/indra/llimage/llpngwrapper.cpp index a19e778..0054adf 100644 --- a/linden/indra/llimage/llpngwrapper.cpp +++ b/linden/indra/llimage/llpngwrapper.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
diff --git a/linden/indra/llimage/llpngwrapper.h b/linden/indra/llimage/llpngwrapper.h index e784e79..b773b72 100644 --- a/linden/indra/llimage/llpngwrapper.h +++ b/linden/indra/llimage/llpngwrapper.h | |||
@@ -11,12 +11,12 @@ | |||
11 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
12 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 12 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 13 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
14 | * online at http://secondlife.com/developers/opensource/gplv2 | 14 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
15 | * | 15 | * |
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlife.com/developers/opensource/flossexception | 19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
20 | * | 20 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 21 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 22 | * that you have read and understood your obligations described above, |