Revert "Embed NVIDIA licence"

This reverts commit cb7c9e79c85f031c892768c16905f60d3a0f8928.

1 files changed, 2 insertions, 37 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 5975af0fb3..55f7488971 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -93,7 +93,6 @@ 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 
@@ -134,43 +133,9 @@ Dummy Name replaced at run time
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-        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.
-
+        This software contains source code provided by NVIDIA Corporation.
 
-Cass Everitt - cass@r3.nu
+        All rights reserved.  See licenses.txt for details.
       </text_editor>
       </panel>
     </tab_container>