diff --git a/autobuild.xml b/autobuild.xml index 9cbb4598..b3831b4c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3844,6 +3844,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors --fmodstudio --platform linux + --package default diff --git a/indra/newview/skins/default/toolbars.xml b/indra/newview/skins/default/toolbars.xml index 144281f6..659855f7 100644 --- a/indra/newview/skins/default/toolbars.xml +++ b/indra/newview/skins/default/toolbars.xml @@ -8,29 +8,25 @@ button_alignment="left" button_display_mode="icons_only" button_layout_style="fill"> - - ` + + - - - - + + + + - diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 5ba46354..224e8854 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -33,8 +33,8 @@ top="16" width="434" wrap="true"> -For the latest information about Firestorm, visit -https://www.firestormviewer.org +For the latest information about Puma, visit +https://avataresargentinos.com.ar/puma -Firestorm would not be possible without the decision from Linden Lab to make their Second Life viewer source code available. +Puma would not be possible without the decision from Linden Lab to make their Second Life viewer source code available. Second Life is brought to you by the Lindens, with open source contributions from: @@ -93,20 +93,20 @@ Dummy Name replaced at run time + label="Puma Credits" + help_topic="about_pmcredits_tab" + name="pm_credits_panel"> -Firestorm is a community development project to improve the SecondLife(tm) Viewer experience. We package contributions from various community developers along with code from Linden Lab and ourselves to bring you a quality, feature-rich viewer experience backed up by a large volunteer support team. Firestorm is brought to you by The Phoenix Firestorm Project, Inc., a non-profit organization. +Puma is a personal development project to improve the SecondLife(tm) Viewer experience. We package contributions from various community developers along with code f +rom Linden Lab and, mainly, from Firestorm Viewer Project. Puma is brought to you by Avatares Argentinos. -The Firestorm Development Team: +The Puma Development Team: -Angeldark Raymaker, Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Chanayane, Cinder Roxley, Hecklezz, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, minerjr, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, ScentualLust, Selo Jacobus, SimonLsAlt, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic, Yay N' Stuff (mygoditsfullofstars), and Zi Ree. +Damian Zhaoying and Hinaichigo Xaris. -Additional code generously contributed to Firestorm by: +Additional code generously contributed to Puma by: @@ -176,7 +177,7 @@ Aira Yumi, Albatroz Hird, Alexie Birman, Andromeda Rage, Angus Boyd, Animats, Ar top_pad="8" width="450" wrap="true"> -Special thanks to our Firestorm Support Team, Beta Testers, wiki editors, educators and translators: +Special thanks to Firestorm Support Team, Beta Testers, wiki editors, educators and translators: -Firestorm includes Starlight, modified for Firestorm. It is provided by residents for residents, with the intention of providing an alternative, brighter, and hopefully easier to use interface. For further details see <nolink>https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight</nolink>. +Puma includes Starlight, modified for Firestorm. It is provided by residents for residents, with the intention of providing an alternative, brighter, and hopefully easier to use interface. For further details see <nolink>https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight</nolink>. UI Artists and Designers: @@ -217,7 +218,7 @@ UI Artists and Designers: top_pad="4" width="450" wrap="true"> -Adam Frisby, Alexandrea Fride, DarkAgent Baphomet, David Rowe, Digital Scribe, Dragonborn Forzane, Hitomi Tiponi, Hugh Helendale, KirstenLee Cinquetti, Mobius Ryba, Nadin, Naomah Beaumont, psi Merlin, samm florian, Sammie Benoir, Tommi Waydelich and Vincent Nacon. +Hinaichigo Xaris, Adam Frisby, Alexandrea Fride, DarkAgent Baphomet, David Rowe, Digital Scribe, Dragonborn Forzane, Hitomi Tiponi, Hugh Helendale, KirstenLee Cinquetti, Mobius Ryba, Nadin, Naomah Beaumont, psi Merlin, samm florian, Sammie Benoir, Tommi Waydelich and Vincent Nacon. diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml index e679091f..58fbef77 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml @@ -331,7 +331,7 @@ min_val="-2147483647" mouse_opaque="true" name="ChatChannel" - tool_tip="Channel to send chat on. Enabled in Preferences -> Chat -> Firestorm -> Show channel selection in chat bar." /> + tool_tip="Channel to send chat on. Enabled in Preferences -> Chat -> Puma -> Show channel selection in chat bar." /> diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index eafdbbe5..c330a333 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -202,7 +202,7 @@ The web browser plugin seems to be taking a while to open. If the plugin never loads, please visit: -https://wiki.firestormviewer.org/fs_media +https://wiki.avataresargentinos.com.ar for possible steps to resolve this issue. diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index fe05b635..92e1162f 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -198,19 +198,19 @@ help_topic="preferences_crashreports_tab" name="crashreports" /> + help_topic="preferences_puma_tab" + name="puma" /> + help_topic="preferences_grids_tab" + name="grids" /> diff --git a/indra/newview/skins/default/xui/en/floater_whitelist.xml b/indra/newview/skins/default/xui/en/floater_whitelist.xml index 4e91769f..361de3fb 100644 --- a/indra/newview/skins/default/xui/en/floater_whitelist.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist.xml @@ -18,7 +18,7 @@ Anti-virus and Anti-malware are an essential part of safe Internet use, but they To reduce interference and improve stability and performance, we strongly advise that all users ensure that there are exclusions (known as Whitelisting) for important folders and programs that the viewer uses. For more detailed information, visit -https://wiki.firestormviewer.org/antivirus_whitelisting +https://wiki.avataresargentinos.com.ar - \ No newline at end of file + diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 509e63c3..a84ce85f 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -57,13 +57,13 @@ tear_off="true" name="Help"> + parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" /> + parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" /> - + - + + name="avataresargentinos_blog_url" + parameter="WebLaunchExternalTarget,https://avtaresargentinos.com.ar/" /> + label="Ayuda Virtual Blog" + name="Ayuda Virtual Blog"> + name="ayudavirtual_blog_url" + parameter="WebLaunchExternalTarget,https://ayudavirtual.org/" /> + label="Ayuda Virtual Flickr" + name="Ayuda Virtual Flickr"> + name="ayudavirtual_flickr_url" + parameter="WebLaunchExternalTarget,https://www.flickr.com/people/ayudavirtual/" /> + label="Ayuda Virtual YouTube" + name="Ayuda Virtual YouTube"> + name="ayudavirtual_youtube_url" + parameter="WebLaunchExternalTarget,https://www.youtube.com/@AYUDAVIRTUALSecondlife" /> + label="Avatares Argentinos X/Twitter" + name="Avatares Argentinos Twitter"> + name="avataresargentinos_twitter_url" + parameter="WebLaunchExternalTarget,https://x.com/Avat_Arg" /> - - - + + @@ -2523,51 +2523,42 @@ + parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" /> + label="Ayuda Virtual Tutoriales" + name="Ayuda Virtual Tutoriales"> + name="ayudabirtual_tutoriales_url" + parameter="WebLaunchExternalTarget,https://ayudavirtual.org/tutoriales" /> + label="Join Puma Support Group" + name="puma_support_group"> + parameter="https://wiki.avataresargentinos.com.ar/grupos_soporte_puma" /> + label="Ayuda Virtual Classes Schedule" + name="Ayuda Virtual Classes Schedule"> - - - - + parameter="WebLaunchExternalTarget,https://ayudavirtual.org" /> - Installation of [APP_NAME] is defective. Please [https://www.firestormviewer.org/downloads download a new copy] of the Viewer and reinstall. + Installation of [APP_NAME] is defective. Please [https://wiki.avataresargentinos.com.ar/descargas download a new copy] of the Viewer and reinstall. fail confirm - https://wiki.firestormviewer.org/fs_system_requirements + https://wiki.avataresargentinos.com.ar - https://www.firestormviewer.org/support/ + https://wiki.avataresargentinos.com.ar
+ + + Manage Grids + + + + + + + + + + Grid Name: + + + + + + Grid URI: + + + + Login Page: + + + + Helper URI: + + + + Grid Website: + + + + Grid Support: + + + + Grid Registration: + + + + Grid Password URI: + + + + Grid Search: + + + + Grid Message URI: + + + + + + + + Override current search url: (no override if empty) + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_puma.xml b/indra/newview/skins/default/xui/en/panel_preferences_puma.xml new file mode 100644 index 00000000..88dd69b4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_puma.xml @@ -0,0 +1,1776 @@ + + + + + === OFF === + + + Not set + + + Not available + + + Not logged in + + + + + + + + + (requires restart) + + + + + + + + + + + + + + + + + + + + + + + + Revoke Permissions: + + + + + + + + + + Texture Lag Protection (may break some objects): + + + + + + + + + + Max lines in a single message: + + + + Max events from same source: + + + + Sound play requests multiplier: + + + + Sound preload requests multiplier: + + + + + + Script Editor Font: + + + + + + + + + + + + + + + + + + + + + + Preprocessor include path: + + + + + External Editor: + + + + + + + + + + + + + + + + Constrain rotations to multiples of + + + + degrees, when not using 'snap to grid' + + + + + objects + + + + + + + + + + + + + + + + Current destination folders for uploads: + + + + Images + + + + + Sounds + + + + + Animations + + + + + Models + + + + + PBR Materials + + + + + To change a destination folder, right click on it in inventory and choose + "Use as default for" + +