Merge branch 'main' into DRTVWR-559

5 files changed, 43 insertions, 5 deletions

diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index 748e3e8b61..03ac4bc9f2 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llxml)
 
 include(00-Common)
 include(LLCommon)
+include(LLWindow)
 
 set(llxml_SOURCE_FILES
     llcontrol.cpp
@@ -31,6 +32,7 @@ target_link_libraries( llxml
         llmath
         llcommon
         ll::expat
+        ll::SDL
     )
 target_include_directories( llxml  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 455df13e48..8f465b00a2 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -29,6 +29,7 @@
 
 #include <iostream>
 #include <map>
+#include <SDL_rwops.h>
 
 #include "llxmlnode.h"
 
diff --git a/indra/newview/character/attentions.xml b/indra/newview/character/attentions.xml
index be9a2b28fc..9bda3309ac 100644
--- a/indra/newview/character/attentions.xml
+++ b/indra/newview/character/attentions.xml
@@ -33,7 +33,7 @@ MOUSELOOK: Tracks center of view when in mouselook view mode.
       <param attention="hover"        priority="4.0" timeout="1.0"  />
       <param attention="conversation" priority="0.0" timeout="-1"   />
       <param attention="select"       priority="6.0" timeout="-1"   />
-      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="0.0" timeout="-1"   />
       <param attention="mouselook"    priority="7.0" timeout="-1"   />
    </gender>
    <gender name="Feminine">
@@ -44,7 +44,7 @@ MOUSELOOK: Tracks center of view when in mouselook view mode.
       <param attention="hover"        priority="4.0" timeout="1.0"  />
       <param attention="conversation" priority="0.0" timeout="-1"   />
       <param attention="select"       priority="6.0" timeout="-1"   />
-      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="0.0" timeout="-1"   />
       <param attention="mouselook"    priority="7.0" timeout="-1"   />
    </gender>
 </linden_attentions>
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 416848f9af..2337252b2d 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -517,7 +517,7 @@ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production)
 void LLProgressView::initTextures(S32 location_id, bool is_in_production)
 {
     initStartTexture(location_id, is_in_production);
-    initLogos();
+    //initLogos();
 
     childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE);
     childSetVisible("panel_top_spacer", mLogosList.empty() ? TRUE : FALSE);
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>