diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 051ce0d06a..3706485535 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2126,7 +2126,7 @@ endif (FMODEX) # Output device selection # set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") -set_source_files_properties(llstartup.cpp llfloaterpreference.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") +set_source_files_properties(llstartup.cpp llfloaterpreference.cpp llfloaterabout.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") # list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 2e5fff5589..991a68b3d7 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -143,6 +143,10 @@ BOOL LLFloaterAbout::postBuild() // boost::bind(&LLFloaterAbout::onClickUpdateCheck, this)); // +#if LL_FMODSTUDIO || LL_FMODEX + childSetVisible("logos_panel", true); +#endif + static const LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor"); if (gAgent.getRegion()) diff --git a/indra/newview/skins/default/textures/icons/FMOD_logo.png b/indra/newview/skins/default/textures/icons/FMOD_logo.png new file mode 100644 index 0000000000..0675b5d13d Binary files /dev/null and b/indra/newview/skins/default/textures/icons/FMOD_logo.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b34fa8c61e..af0b05d32f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1026,6 +1026,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index c47cace98e..fe15e040ce 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -44,37 +44,6 @@ UI-Künstler und Designer: - - 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion. -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg (daniel@haxx.se). -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm und Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University sowie David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW). -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus. -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge. -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga. -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com). -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly und Mark Adler. - -Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com. - -Diese Software enthält von der NVIDIA Corporation bereitgestellten Quellcode. - -Alle Rechte vorbehalten. Details siehe licenses.txt. - -Audiocodierung für Voice-Chat: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 9fbc8aed4d..d85b9d9ba3 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -227,17 +227,40 @@ Adam Frisby, Alexandrea Fride, DarkAgent Baphomet, David Rowe, Digital Scribe, H label="Licenses" help_topic="about_licenses_tab" name="licenses_panel"> + + + + 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion APR Copyright (C) 2011 The Apache Software Foundation @@ -270,6 +293,70 @@ All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index e26053dc17..061a2bdeef 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -83,38 +83,6 @@ Artistas y Diseñadores de la interfaz: - -3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System, Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, y Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly y Mark Adler. -Algunos iconos por Joseph Wain / glyphish.com - -Second Life Viewer usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y sus licenciadores). Todos los derechos reservados. Ver www.havok.com para más detalles. - -Este software contiene código fuente proporcionado por NVIDIA Corporation. - -Todos los derechos reservados. Ver licenses.txt para más detalles. - -Codificación de audio del chat de voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml index 02dd582ab0..9ff9741d40 100644 --- a/indra/newview/skins/default/xui/it/floater_about.xml +++ b/indra/newview/skins/default/xui/it/floater_about.xml @@ -64,37 +64,6 @@ con contributi open source da: - - 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. - -Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com. - -Questo software contiene codice sorgente fornito da NVIDIA Corporation. - -Tutti i diritti riservati. Per informazioni dettagliate, vedere licenses.txt. - -Codifica audio chat vocale: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index e913cf9497..0e0b04d33f 100644 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml @@ -11,34 +11,6 @@ Dummy Name は実行時間に置き換え - 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. - -Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。 - -このソフトウェアには、NVIDIA Corporation によるソースコードが含まれます。 - -無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。 - -ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C) diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index 8703d03596..01f4e527fd 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -64,37 +64,6 @@ com contribuições de código aberto de: - - 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. - -O Visualizador do Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e seus Licenciantes). Todos os direitos reservados. Consulte www.havok.com para obter detalhes. - -Este software contém código fonte fornecido pela NVIDIA Corporation. - -Todos os direitos reservados. Consulte licenses.txt para obter detalhes. - -Codificação de áudio da conversa com voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml index b938fe7bf7..aba5e1a84e 100644 --- a/indra/newview/skins/default/xui/tr/floater_about.xml +++ b/indra/newview/skins/default/xui/tr/floater_about.xml @@ -57,37 +57,6 @@ açık kaynak kod katkısında bulunanlar: - - 3Dconnexion SDK Telif Hakkı (C) 1992-2009 3Dconnexion -APR Telif Hakkı (C) 2011 The Apache Software Foundation -Collada DOM Telif Hakkı 2006 Sony Computer Entertainment Inc. -cURL Telif Hakkı (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Telif Hakkı (C) 2002, 2003 CodeFactory AB / Telif Hakkı (C) 2003, 2004 Red Hat, Inc. -expat Telif Hakkı (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Hakkı (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Telif Hakkı (C) 1996-2002, 2006 David Turner, Robert Wilhelm ve Werner Lemberg. -GL Telif Hakkı (C) 1999-2004 Brian Paul. -GLOD Telif Hakkı (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University ve David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Telif Hakkı (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Telif Hakkı (C) 2002, Xiphophorus -OpenSSL Telif Hakkı (C) 1998-2008 The OpenSSL Project. -PCRE Telif Hakkı (c) 1997-2012 University of Cambridge -SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc. -zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler. - -Second Life Görüntüleyicisi Havok (TM) Fizik motorunu kullanmaktadır. (c)Telif Hakkı 1999-2010 Havok.com Inc. (ve Lisans Verenleri). Tüm Hakları Saklıdır. Ayrıntılı bilgi için bkz. www.havok.com - -Bu yazılımda NVIDIA Corporation tarafından sağlanan kaynak kod yer almaktadır. - -Tüm hakları saklıdır. Ayrıntılı bilgi için bkz. licenses.txt - -Sesli sohbet için Ses kodlaması: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml index d0e1301057..3ed72503f2 100644 --- a/indra/newview/skins/default/xui/zh/floater_about.xml +++ b/indra/newview/skins/default/xui/zh/floater_about.xml @@ -51,35 +51,6 @@ http://www.firestormviewer.org - - 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion -APR Copyright (C) 2011 The Apache Software Foundation -Collada DOM Copyright 2006 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FMOD Sound System Copyright (C) Firelight Technologies Pty, Ltd., 1994-2020 -FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -HACD Copyright (C) 2011, Khaled Mamou (kmamou@gmail.com) -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2002, Xiphophorus -OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. -PCRE Copyright (c) 1997-2012 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. - -第二人生 Viewer 採用 Havok (TM) 物理引擎。 (c)Copyright 1999-2010 Havok.com Inc.（及其放照人）。 保留一切權利。 詳情見 www.havok.com。 - -保留一切權利。 詳情見 licenses.txt。 - -語音聊天音頻技術：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - diff --git a/indra/newview/skins/starlight/themes/mono_teal/textures/icons/FMOD_logo.png b/indra/newview/skins/starlight/themes/mono_teal/textures/icons/FMOD_logo.png new file mode 100644 index 0000000000..24c0d5142d Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/textures/icons/FMOD_logo.png differ diff --git a/indra/newview/skins/starlight/themes/silver_blue/textures/icons/FMOD_logo.png b/indra/newview/skins/starlight/themes/silver_blue/textures/icons/FMOD_logo.png new file mode 100644 index 0000000000..24c0d5142d Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/textures/icons/FMOD_logo.png differ diff --git a/indra/newview/skins/starlight/themes/silver_pink/textures/icons/FMOD_logo.png b/indra/newview/skins/starlight/themes/silver_pink/textures/icons/FMOD_logo.png new file mode 100644 index 0000000000..24c0d5142d Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/textures/icons/FMOD_logo.png differ diff --git a/indra/newview/skins/starlightcui/themes/custom_light/textures/icons/FMOD_logo.png b/indra/newview/skins/starlightcui/themes/custom_light/textures/icons/FMOD_logo.png new file mode 100644 index 0000000000..24c0d5142d Binary files /dev/null and b/indra/newview/skins/starlightcui/themes/custom_light/textures/icons/FMOD_logo.png differ