summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-10-08 20:20:04 +0800
committerErik Kundiman <erik@megapahit.org>2023-10-08 20:20:04 +0800
commitcb7c9e79c85f031c892768c16905f60d3a0f8928 (patch)
tree537b97fa0245e027baab376279f7e7d664f5e3df /indra/newview
parent120e56754ccb3c6d7ab0da40e014701f2685b510 (diff)
Embed NVIDIA licence
Since we're not distributing licenses.txt yet (not using the Python script).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml39
1 files changed, 37 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 55f7488971..5975af0fb3 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -93,6 +93,7 @@ Dummy Name replaced at run time
width="465"
word_wrap="true">
The library that is linked statically to this software is OpenJPEG v2.5.0. See the license below.
+
/*
* The copyright in this software is being made available under the 2-clauses
* BSD License, included below. This software may be subject to other third
@@ -133,9 +134,43 @@ Dummy Name replaced at run time
* POSSIBILITY OF SUCH DAMAGE.
*/
- This software contains source code provided by NVIDIA Corporation.
+ This software contains source code provided by NVIDIA Corporation. See the license below.
+
+Copyright (c) 2000 Cass Everitt
+ Copyright (c) 2000 NVIDIA Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ * The names of contributors to this software may not be used
+ to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
- All rights reserved. See licenses.txt for details.
+Cass Everitt - cass@r3.nu
</text_editor>
</panel>
</tab_container>