Damian/Puma_Viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modificaciones de UI

Browse Source
This commit is contained in:
Damian
2025-05-26 21:05:33 -03:00
parent 0fd831ce70
commit 0afac26523
51 changed files with 2612 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/skins/default/xui/en/floater_about.xml
+21 -20
View File
@@ -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
</text>
<text_editor
parse_urls="true"
@@ -71,7 +71,7 @@ https://www.firestormviewer.org
top="16"
width="489"
wrap="true">
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
<panel
height="920"
border="true"
label="Firestorm Credits"
help_topic="about_fscredits_tab"
name="fs_credits_panel">
label="Puma Credits"
help_topic="about_pmcredits_tab"
name="pm_credits_panel">
<scroll_container
follows="all"
layout="topleft"
left="0"
name="fs_credits_scroll_container"
name="pm_credits_scroll_container"
reserve_scroll_corner="false"
top="16"
bottom="-1"
right="-4">
<panel
name="fs_credits_scroll_container_content_panel"
name="pm_credits_scroll_container_content_panel"
follows="left|top"
layout="topleft"
min_height="300"
@@ -120,13 +120,14 @@ Dummy Name replaced at run time
height="102"
layout="topleft"
left="5"
name="firestorm_intro"
name="puma_intro"
top="0"
width="450"
wrap="true">
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:
</text>
<text
enabled="false"
@@ -136,22 +137,22 @@ The Firestorm Development Team:
left="5"
text_color="LtGray"
max_length="65536"
name="firestorm_names"
name="puma_names"
top_pad="4"
width="450"
wrap="true">
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.
</text>
<text
follows="top|left"
height="15"
layout="topleft"
left="5"
name="fs_contrib_intro"
name="pm_contrib_intro"
top_pad="8"
width="450"
wrap="true">
Additional code generously contributed to Firestorm by:
Additional code generously contributed to Puma by:
</text>
<text
enabled="false"
@@ -161,7 +162,7 @@ Additional code generously contributed to Firestorm by:
left="5"
text_color="LtGray"
max_length="65536"
name="fs_contrib_names"
name="pm_contrib_names"
top_pad="4"
width="450"
wrap="true">
@@ -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:
</text>
<text
enabled="false"
@@ -197,11 +198,11 @@ Afrika Burton, Albatroz Hird, Alexru Resident, alison Seesaw, AnaLucia Loon, Ang
height="78"
layout="topleft"
left="5"
name="fs_art_intro"
name="pm_art_intro"
top_pad="8"
width="450"
wrap="true">
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 &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
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 &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
UI Artists and Designers:
</text>
@@ -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.
</text>
</panel>
</scroll_container>
indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+1 -1
View File
@@ -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." />
</layout_panel>
<layout_panel
indra/newview/skins/default/xui/en/floater_fs_search.xml
+1 -1
View File
@@ -12,7 +12,7 @@
positioning="centered"
save_rect="true"
single_instance="true"
title="Firestorm Search"
title="Puma Search"
width="780">
<!-- Strings -->
<floater.string name="string.location">
indra/newview/skins/default/xui/en/floater_media_browser.xml
+1 -1
View File
@@ -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.
</text>
indra/newview/skins/default/xui/en/floater_preferences.xml
+10 -10
View File
@@ -198,19 +198,19 @@
help_topic="preferences_crashreports_tab"
name="crashreports" />
<panel
class="panel_preference_firestorm"
filename="panel_preferences_firestorm.xml"
label="Firestorm"
class="panel_preference_puma"
filename="panel_preferences_puma.xml"
label="Puma"
layout="topleft"
help_topic="preferences_firestorm_tab"
name="firestorm" />
help_topic="preferences_puma_tab"
name="puma" />
<panel
class="panel_preference_opensim"
filename="panel_preferences_opensim.xml"
label="Opensim"
class="panel_preference_grids"
filename="panel_preferences_grids.xml"
label="Grids"
layout="topleft"
help_topic="preferences_opensim_tab"
name="opensim" />
help_topic="preferences_grids_tab"
name="grids" />
<panel
class="panel_preference_backup"
filename="panel_preferences_backup.xml"
indra/newview/skins/default/xui/en/floater_web_content.xml
+1 -5
View File
@@ -203,11 +203,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_search_issues
and
https://wiki.firestormviewer.org/fs_media
https://wiki.avataresargentinos.com.ar/
for possible steps to resolve this issue.
</text>
indra/newview/skins/default/xui/en/floater_whitelist.xml
+2 -2
View File
@@ -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
</text>
<text
@@ -71,4 +71,4 @@ Add the full paths to your AV executable exclusions as shown in the above wiki.
top_pad="5"
width="689"
word_wrap="true" />
</floater>
</floater>
indra/newview/skins/default/xui/en/menu_login.xml
+4 -4
View File
@@ -57,13 +57,13 @@
tear_off="true"
name="Help">
<menu_item_call
label="Firestorm Wiki"
name="Firestorm Wiki"
label="Avatares Argentinos Wiki"
name="Avatares Argentinos Wiki"
shortcut="F1">
<menu_item_call.on_click
function="PromptShowURL"
name="script_library_url"
parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/doku.php?id=start" />
parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
</menu_item_call>
<menu_item_call
label="Troubleshooting"
@@ -71,7 +71,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_troubleshooting_url"
parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_troubleshooting" />
parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
</menu_item_call>
<menu_item_call
label="Guidebook"
indra/newview/skins/default/xui/en/menu_toolbars.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- <FS:Zi> This file is not used in Firestorm, we use the horizontal/vertical files -->
<!-- <FS:Zi> This file is not used in Puma, we use the horizontal/vertical files -->
<context_menu
layout="topleft"
indra/newview/skins/default/xui/en/menu_viewer.xml
+41 -50
View File
@@ -2454,53 +2454,53 @@
parameter="WebLaunchExternalTarget,https://community.secondlife.com" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Firestorm Blog"
name="Firestorm Blog">
<menu_item_call
label="Avatares Argentinos Blog"
name="Avatares Argentinos Blog">
<menu_item_call.on_click
function="PromptShowURL"
name="firestorm_blog_url"
parameter="WebLaunchExternalTarget,https://www.firestormviewer.org/" />
name="avataresargentinos_blog_url"
parameter="WebLaunchExternalTarget,https://avtaresargentinos.com.ar/" />
</menu_item_call>
<menu_item_call
label="Firestorm Flickr"
name="Firestorm Flickr">
label="Ayuda Virtual Blog"
name="Ayuda Virtual Blog">
<menu_item_call.on_click
function="PromptShowURL"
name="firestorm_flickr_url"
parameter="WebLaunchExternalTarget,http://www.flickr.com/groups/firestormviewer/pool/" />
name="ayudavirtual_blog_url"
parameter="WebLaunchExternalTarget,https://ayudavirtual.org/" />
</menu_item_call>
<menu_item_call
label="Firestorm YouTube"
name="Firestorm YouTube">
label="Ayuda Virtual Flickr"
name="Ayuda Virtual Flickr">
<menu_item_call.on_click
function="PromptShowURL"
name="firestorm_youtube_url"
parameter="WebLaunchExternalTarget,http://www.youtube.com/user/PhoenixViewerSL" />
name="ayudavirtual_flickr_url"
parameter="WebLaunchExternalTarget,https://www.flickr.com/people/ayudavirtual/" />
</menu_item_call>
<menu_item_call
label="Firestorm Twitter"
name="Firestorm Twitter">
label="Ayuda Virtual YouTube"
name="Ayuda Virtual YouTube">
<menu_item_call.on_click
function="PromptShowURL"
name="firestorm_twitter_url"
parameter="WebLaunchExternalTarget,https://twitter.com/phoenixviewersl" />
name="ayudavirtual_youtube_url"
parameter="WebLaunchExternalTarget,https://www.youtube.com/@AYUDAVIRTUALSecondlife" />
</menu_item_call>
<menu_item_call
label="Firestorm Plurk"
name="Firestorm Plurk">
label="Avatares Argentinos X/Twitter"
name="Avatares Argentinos Twitter">
<menu_item_call.on_click
function="PromptShowURL"
name="firestorm_plurk_url"
parameter="WebLaunchExternalTarget,http://www.plurk.com/ThePhoenixViewerProject" />
name="avataresargentinos_twitter_url"
parameter="WebLaunchExternalTarget,https://x.com/Avat_Arg" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Message of the day"
name="Firestorm MoTD">
<menu_item_call.on_click
function="Advanced.ToggleHUDInfo"
parameter="motd" />
<menu_item_call
label="Ayuda Virtual X/Twitter"
name="Ayuda Virtual Twitter">
<menu_item_call.on_click
function="PromptShowURL"
name="ayudavirtual_twitter_url"
parameter="WebLaunchExternalTarget,https://x.com/ayuda_sl" />
</menu_item_call>
</menu>
@@ -2523,51 +2523,42 @@
</menu_item_check>
<menu_item_call
label="Firestorm Wiki"
name="Firestorm Wiki"
label="Avatares Argentinos Wiki"
name="Avatares Argentinos Wiki"
shortcut="F1">
<menu_item_call.on_click
function="PromptShowURL"
name="script_library_url"
parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org" />
parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
</menu_item_call>
<menu_item_call
label="Troubleshooting"
name="Troubleshooting">
label="Ayuda Virtual Tutoriales"
name="Ayuda Virtual Tutoriales">
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_troubleshooting_url"
parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_troubleshooting" />
name="ayudabirtual_tutoriales_url"
parameter="WebLaunchExternalTarget,https://ayudavirtual.org/tutoriales" />
</menu_item_call>
<menu_item_call
label="Join Firestorm Support Group"
name="firestorm_support_group">
label="Join Puma Support Group"
name="puma_support_group">
<menu_item_call.on_click
function="Advanced.WebBrowserTest"
parameter="https://wiki.firestormviewer.org/firestorm_support_groups_join" />
parameter="https://wiki.avataresargentinos.com.ar/grupos_soporte_puma" />
<menu_item_call.on_visible
function="GridCheck"
parameter="secondlife" />
</menu_item_call>
<menu_item_call
label="Firestorm Classes Schedule"
name="Firestorm Classes Schedule">
label="Ayuda Virtual Classes Schedule"
name="Ayuda Virtual Classes Schedule">
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_classes_url"
parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_classes" />
</menu_item_call>
<menu_item_call
label="Firestorm Events Calendar"
name="Firestorm Events Calendar">
<menu_item_call.on_click
function="PromptShowURL"
name="events_calendar_url"
parameter="WebLaunchExternalTarget,https://teamup.com/ksxdajnbw9mvw7cbwz" />
parameter="WebLaunchExternalTarget,https://ayudavirtual.org" />
</menu_item_call>
<menu_item_check
indra/newview/skins/default/xui/en/notifications.xml
+20 -47
View File
@@ -193,7 +193,7 @@ No tutorial is currently available.
icon="alertmodal.tga"
name="BadInstallation"
type="alertmodal">
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.
<tag>fail</tag>
<usetemplate
name="okbutton"
@@ -1905,7 +1905,7 @@ Visit [_URL] for more information?
<tag>confirm</tag>
<url option="0" name="url">
https://wiki.firestormviewer.org/fs_system_requirements
https://wiki.avataresargentinos.com.ar
</url>
<usetemplate
ignoretext="My computer hardware is not supported"
@@ -3947,7 +3947,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
<url option="1" name="url">
https://www.firestormviewer.org/support/
https://wiki.avataresargentinos.com.ar
</url>
<form name="form">
<button
@@ -3975,7 +3975,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
<url option="1" name="url">
https://www.firestormviewer.org/support/
https://wiki.avataresargentinos.com.ar
</url>
<form name="form">
<button
@@ -9858,7 +9858,7 @@ Select residents to share with.
icon="alert.tga"
type="alert">
[LABEL] failed to upload: [MESSAGE]
[DETAILS] See Firestorm.log for details
[DETAILS] See Puma.log for details
</notification>
<notification
@@ -9867,7 +9867,7 @@ Select residents to share with.
type="alert">
[LABEL] failed to upload: [MESSAGE]
See Firestorm.log for details
See Puma.log for details
</notification>
<notification
@@ -10068,7 +10068,7 @@ Please check your network and firewall setup.
Disable any SIP ALG feature in your router.
Voice communications will not be available.
https://wiki.firestormviewer.org/fs_voice
https://wiki.avataresargentinos.com.ar
<tag>voice</tag>
<tag>fail</tag>
<usetemplate
@@ -10085,7 +10085,7 @@ We're having trouble connecting to your voice server.
Voice communications will not be available.
Please check your network and firewall setup.
[https://wiki.firestormviewer.org/fs_voice]
[https://wiki.avataresargentinos.com.ar]
<tag>voice</tag>
<tag>fail</tag>
<usetemplate
@@ -11160,27 +11160,7 @@ This will send the following information to the current IM session:
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="FireStormReqInfo"
type="alertmodal">
[NAME] is requesting that you send them information about your [APP_NAME] setup.
(This is the same information that can be found by going to Help->About [APP_NAME])
[REASON]
Would you like to send them this information?
<form name="form">
<button
index="0"
name="Yes"
text="Yes"/>
<button
index="1"
name="No"
text="No"/>
</form>
</notification>
<!-- Firestorm Phantom -->
<!-- Puma Phantom -->
<notification
icon="notifytip.tga"
@@ -11196,20 +11176,13 @@ Phantom mode on.
Phantom mode off.
</notification>
<notification
icon="notifytip.tga"
name="FlightAssistEnabled"
type="notifytip">
Flight Assist is enabled
</notification>
<!-- Puma Phantom -->
<!-- Firestorm Phantom -->
<!-- Firestorm Reset Settings -->
<!-- Puma Reset Settings -->
<notification
icon="alertmodal.tga"
label="Reset all settings"
name="FirestormClearSettingsPrompt"
name="PumaClearSettingsPrompt"
type="alertmodal">
Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any customizations you have made to the default configuration.
@@ -11226,7 +11199,7 @@ Flight Assist is enabled
type="alertmodal">
Settings will be cleared after restarting [APP_NAME].
</notification>
<!-- Firestorm Reset Settings -->
<!-- Puma Reset Settings -->
<!-- AW: opensim -->
<notification icon="alertmodal.tga"
@@ -11397,7 +11370,7 @@ Your viewer cache is currently empty. Please be aware that you may experience sl
icon="alertmodal.tga"
name="FirstJoinSupportGroup2"
type="alertmodal">
Welcome to the Phoenix/Firestorm Viewer Support Group!
Welcome to the Puma Viewer Support Group!
To make support easier, it is recommended to announce your viewer's version to the group. This information includes current viewer version, viewer skin, operating system and RLVa status. You can choose to display your viewer's version in front of any chat you send to the group. Our support members can give you more meaningful advice right away if they know the viewer version you are on.
@@ -11417,7 +11390,7 @@ Do you want to enable the automatic viewer version display?
text="No"/>
<ignore
name="ignore"
text="The Phoenix/Firestorm Support Group was joined"
text="The Puma Support Group was joined"
save_option="true" />
</form>
@@ -14059,8 +14032,8 @@ This setting is intended for cases where VRAM detection is reporting incorrect v
name="CurrencyURIOverrideReceived"
type="alertmodal">
This region has elected to specify a third-party currency portal.
Please note that currency purchases made through Firestorm Viewer are transactions between you (the user) and the provider(s) or seller(s) of the currency.
Neither Firestorm Viewer, the Phoenix Firestorm Viewer Project Inc., nor its team shall be liable for any cost or damage arising either directly or indirectly from any such transaction.
Please note that currency purchases made through Puma Viewer are transactions between you (the user) and the provider(s) or seller(s) of the currency.
Neither Puma Viewer, Avatares Argentinos, nor its team shall be liable for any cost or damage arising either directly or indirectly from any such transaction.
If you do not agree to these terms of use, then no financial transactions should be conducted using this viewer.
<usetemplate
ignoretext="When the region sets a new currency helper."
@@ -14570,9 +14543,9 @@ Bulk import of Windlights has finished.
<unique combine = "cancel_old">
<context>FSAOScriptedNotification</context>
</unique>
Firestorm Animation Overrider: [AO_MESSAGE]
Puma Animation Overrider: [AO_MESSAGE]
<usetemplate
ignoretext="Warn me when the Firestorm Animation Overrider gets accessed by a scripted object"
ignoretext="Warn me when the Puma Animation Overrider gets accessed by a scripted object"
name="notifyignore"/>
</notification>
<notification
@@ -14644,7 +14617,7 @@ Some antivirus programs may mistakenly block parts of [APP_NAME], slowing down i
For detailed instructions on how to whitelist [APP_NAME] - including a list of files and folders to exclude - please visit our guide:
https://wiki.firestormviewer.org/antivirus_whitelisting
https://wiki.avataresargentinos.com.ar
</notification>
<notification
indra/newview/skins/default/xui/en/panel_login.xml
+1 -1
View File
@@ -15,7 +15,7 @@
</panel.string>
<panel.string
name="sign_up_url">
https://www.firestormviewer.org/join-secondlife/
https://ayudavirtual.org/unirseasl/
</panel.string>
<layout_stack
follows="left|right|top"
indra/newview/skins/default/xui/en/panel_login_first.xml
+1 -1
View File
@@ -15,7 +15,7 @@
</panel.string>
<panel.string
name="sign_up_url">
https://www.firestormviewer.org/join-secondlife/
https://ayudavirtual.org/unirseasl/
</panel.string>
<layout_stack
follows="left|right|top|bottom"
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+7 -7
View File
@@ -10,7 +10,7 @@
label="UI-Pref"
name="Display panel">
<tab_container
label="Firestorm Prefs"
label="Puma Prefs"
layout="topleft"
follows="all"
top="5"
@@ -580,7 +580,7 @@
layout="topleft"
left="5"
name="FSDisableIMChiclets"
tool_tip="If checked, Firestorm will not show any group / IM chat chiclets (notifications envelope and sum of IMs will remain on the screen)."
tool_tip="If checked, Puma will not show any group / IM chat chiclets (notifications envelope and sum of IMs will remain on the screen)."
top_pad="6"
width="256" />
<check_box
@@ -591,7 +591,7 @@
layout="topleft"
left="5"
name="FSLegacyNotificationWell"
tool_tip="If checked, Firestorm will use the legacy list view to display stored notifications."
tool_tip="If checked, Puma will use the legacy list view to display stored notifications."
top_pad="3"
width="265" />
<text
@@ -614,7 +614,7 @@
layout="topleft"
left="5"
name="FSLegacyNotificationWellAutoResize"
tool_tip="If checked, Firestorm will always resize the Conversations and legacy Notifications lists automatically when items get added or removed."
tool_tip="If checked, Puma will always resize the Conversations and legacy Notifications lists automatically when items get added or removed."
top_pad="3"
width="450" />
<check_box
@@ -766,7 +766,7 @@
width="270"
left="20"
control_name="FSStatbarLegacyMeanPerSec"
tool_tip="If enabled, Firestorm will use the legacy method of showing the period mean per second value in the traffic indicator instead of the current observed value"/>
tool_tip="If enabled, Puma will use the legacy method of showing the period mean per second value in the traffic indicator instead of the current observed value"/>
<check_box
enabled_control="ShowNetStats"
top_pad="4"
@@ -786,7 +786,7 @@
left="10"
width="270"
control_name="FSEnableVolumeControls"
tool_tip="If checked, Firestorm will show media controls (volume, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
tool_tip="If checked, Puma will show media controls (volume, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
<check_box
top_pad="4"
follows="left|top"
@@ -948,7 +948,7 @@
label="Open avatar profile directly when clicking on its name"
layout="topleft"
name="FSInspectAvatarSlurlOpensProfile"
tool_tip="If enabled, Firestorm will open the profile of an avatar directly when clicking on a link with its name"
tool_tip="If enabled, Puma will open the profile of an avatar directly when clicking on a link with its name"
initial_value="true"
top_pad="6"
left="10"
indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+1 -1
View File
@@ -31,7 +31,7 @@
control_name="ForceShowGrid"
follows="top|left"
height="15"
label="Allow login to other grids (Not all grids will support Firestorm)"
label="Allow login to other grids (Not all grids will support Puma)"
layout="topleft"
left="30"
name="show_grid_selection_check"
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+1 -1
View File
@@ -87,7 +87,7 @@
height="16"
control_name="FSGrowlWhenActive"
name="notify_growl_always_checkbox"
label="Show Growl Notifications even when Firestorm is active"/>
label="Show Growl Notifications even when Puma is active"/>
<check_box
enabled_control="FSEnableGrowl"
layout="topleft"
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+2 -2
View File
@@ -11,7 +11,7 @@
name="chat">
<tab_container
label="Firestorm Prefs"
label="Puma Prefs"
layout="topleft"
follows="all"
top="5"
@@ -1233,7 +1233,7 @@
height="18"
name="FSShowMessageCountInWindowTitle"
control_name="FSShowMessageCountInWindowTitle"
label="Show number of unread IMs in Firestorm's window title"/>
label="Show number of unread IMs in Puma's window title"/>
<check_box
layout="topleft"
indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
+2 -2
View File
@@ -10,7 +10,7 @@
label="Crash Reports"
name="crash_reports">
<panel.string name="PrivacyPolicyUrl">
https://www.firestormviewer.org/privacy-policy
https://avataresargentinos.com.ar/politica-privacidad
</panel.string>
<check_box
layout="topleft"
@@ -19,7 +19,7 @@
top="30"
width="250"
height="16"
label="Send crash reports to firestormviewer.org"
label="Send crash reports to avataresargentinos.com.ar"
name="checkSendCrashReports"
enabled="false" />
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+1 -1
View File
@@ -536,7 +536,7 @@
layout="topleft"
left="196"
name="Fullscreen Mode"
tool_tip="Run Firestorm in Fullscreen mode. A restart is required to change mode."
tool_tip="Run Puma in Fullscreen mode. A restart is required to change mode."
top="60"
width="280" />
indra/newview/skins/default/xui/en/panel_preferences_grids.xml
+434
View File
@@ -0,0 +1,434 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="all"
height="440"
layout="topleft"
left="1"
top="1"
width="540"
label="Opensim"
name="opensim_panel">
<tab_container
label="Opensim"
layout="topleft"
follows="all"
top="5"
bottom="-1"
left="1"
right="-1"
name="tabs"
tab_min_width="50"
tab_position="top" >
<panel
border="false"
follows="all"
height="440"
layout="topleft"
left="0"
top="0"
width="540"
label="Grid Manager"
name="grid_management_panel">
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left="30"
name="add_grid_text"
top="12"
width="400">
Add new grid
</text>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top"
font="SansSerif"
height="19"
layout="topleft"
left="50"
max_length_chars="4096"
name="add_grid"
top_pad="5"
label="Enter a LoginURI"
width="270" />
<button
follows="left|top"
height="19"
label="Clear"
label_selected="Clear"
layout="topleft"
left_pad="2"
name="clear_grid"
top_delta="0"
width="50">
<button.commit_callback
function="Pref.ClearGrid" />
</button>
<button
follows="left|top"
height="19"
label="Apply"
layout="topleft"
left_pad="2"
name="apply_new_grid"
top_delta="0"
width="50">
<button.commit_callback
function="Pref.AddGrid" />
</button>
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left="30"
name="add_grid_text"
top_pad="10"
width="400">
Manage Grids
</text>
<scroll_list
height="125"
layout="topleft"
left="50"
name="grid_list"
draw_heading="true"
top="104"
width="370">
<scroll_list.columns
label="Grid name"
name="grid_label"
width="150" />
<scroll_list.columns
dynamic_width="true"
label="Login URI"
name="login_uri" />
</scroll_list>
<button
follows="left|top"
height="19"
label="Refresh"
layout="topleft"
left_pad="5"
name="refresh_grid"
top_delta="5"
width="75">
<button.commit_callback
function="Pref.RefreshGrid" />
</button>
<button
follows="left|top"
height="19"
label="Remove"
layout="topleft"
left_delta="0"
name="remove_grid"
top_pad="5"
width="75">
<button.commit_callback
function="Pref.RemoveGrid" />
</button>
<panel
border="true"
follows="all"
height="440"
layout="topleft"
left="0"
top="210"
width="540"
label=""
name="advanced_grid_panel">
<text
top="12"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="grid_name_text"
width="130">
Grid Name:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="name_edit"
top_delta="0"
width="300" />
<check_box
visible="false"
control_name="FSEditGrid"
height="16"
label=""
follows="left|top"
layout="topleft"
left_pad="4"
name="enable_lock"
width="16" />
<icon
visible="false"
height="14"
image_name="Locked_Icon"
follows="left|top"
layout="topleft"
left_pad="2"
top_delta="-2"
mouse_opaque="true"
name="lock"
width="10" />
<text
top_pad="6"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="grid_uri_text"
width="130">
Grid URI:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="grid_uri_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="login_page_text"
width="130">
Login Page:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="login_page_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="helper_uri_text"
width="130">
Helper URI:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="helper_uri_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="website_text"
width="130">
Grid Website:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="website_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="support_text"
width="130">
Grid Support:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="support_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="register_text"
width="130">
Grid Registration:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="register_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="password_text"
width="130">
Grid Password URI:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="password_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="search_text"
width="130">
Grid Search:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="search_edit"
top_delta="0"
width="300" />
<text
top_pad="2"
follows="left|top"
layout="topleft"
left="50"
height="16"
name="message_text"
width="130">
Grid Message URI:
</text>
<line_editor
enabled_control="FSEditGrid"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
name="message_edit"
top_delta="0"
width="300" />
</panel>
</panel>
<panel
border="false"
follows="all"
height="440"
layout="topleft"
left="0"
top="0"
width="540"
label="Miscellaneous"
name="opensim_misc_panel">
<check_box
control_name="DebugSearch"
height="16"
initial_value="false"
label="Debug Search"
layout="topleft"
left="30"
name="DebugSearch"
top="12"
width="256" />
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left="50"
name="search_url_debug_text"
top_pad="5"
width="400">
Override current search url: (no override if empty)
</text>
<line_editor
control_name="SearchURLDebug"
enabled_control="DebugSearch"
border_style="line"
border_thickness="1"
follows="left|top"
font="SansSerif"
height="19"
layout="topleft"
left="50"
max_length_chars="4096"
name="search_url_debug"
top_pad="5"
width="270" />
<button
enabled_control="DebugSearch"
follows="left|top"
height="19"
label="Clear"
label_selected="Clear"
layout="topleft"
left_pad="2"
name="clear_search_url_debug"
top_delta="0"
width="50">
<button.commit_callback
function="Pref.ClearDebugSearchURL" />
</button>
<button
enabled_control="DebugSearch"
follows="left|top"
height="19"
label="Pick"
layout="topleft"
left_pad="2"
name="pick_current_search_url"
top_delta="0"
width="50">
<button.commit_callback
function="Pref.PickDebugSearchURL" />
</button>
</panel>
</tab_container>
</panel>
indra/newview/skins/default/xui/en/panel_preferences_puma.xml
+1776
View File
File diff suppressed because it is too large Load Diff
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+2 -2
View File
@@ -41,7 +41,7 @@
mouse_opaque="false"
top_pad="15"
width="500">
Maximum bandwidth ([https://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
Maximum bandwidth ([https://wiki.avataresargentinos.com.ar need a suggestion?]):
</text>
<icon
@@ -395,7 +395,7 @@
name="cache_size_label_l"
top_pad="15"
width="500">
Texture Cache Size ([https://wiki.firestormviewer.org/cache need a suggestion?]):
Texture Cache Size ([https://wiki.avataresargentinos.com.ar/cache need a suggestion?]):
</text>
<slider
can_edit_text="true"
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+2 -2
View File
@@ -23,7 +23,7 @@
</panel.string>
<tab_container
label="Firestorm Prefs"
label="Puma Prefs"
layout="topleft"
follows="all"
top="5"
@@ -1202,7 +1202,7 @@ Hover your mouse cursor over UUID field to show its default value.
left="5"
height="14"
width="150"
tool_tip="Sound UUID played on default Firestorm alerts."
tool_tip="Sound UUID played on default Puma alerts."
name="textFSSndAlert">
Default alert:
</text>
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
-7
View File
@@ -24,13 +24,6 @@
>
Unknown
</string>
<string
name="CaptionTextAcctInfo"
>
[ACCTTYPE]
[PAYMENTINFO]
[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
</string>
<!--Badges-->
<string
indra/newview/skins/default/xui/en/strings.xml
+16 -14
View File
@@ -7,11 +7,11 @@
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">[CURRENT_GRID]</string>
<string name="APP_NAME">Firestorm</string>
<string name="CAPITALIZED_APP_NAME">FIRESTORM</string>
<string name="APP_NAME">Puma</string>
<string name="CAPITALIZED_APP_NAME">PUMA</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Firestorm Support Portal</string>
<string name="DOWNLOAD_URL">https://www.firestormviewer.org/choose-your-platform/</string>
<string name="SUPPORT_SITE">Puma Support Portal</string>
<string name="DOWNLOAD_URL">https://wiki.avataresargentinos.com.ar/descargas/</string>
<string name="CURRENT_GRID"/> <!-- Will be set in fsgridhandler.cpp / llviewernetwork.cpp -->
<string name="VIEWER_GENERATION">Viewer [VERSION]</string>
<string name="SHORT_VIEWER_GENERATION">V[VERSION]</string>
@@ -135,15 +135,15 @@ Voice Server Version: [VOICE_VERSION]
<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
<string name="LoginFailedHeader">Login failed.</string>
<string name="Quit">Quit</string>
<string name="create_account_url">https://www.firestormviewer.org/join-secondlife/</string>
<string name="create_account_url">https://ayudavirtual.org/unirseasl/</string>
<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
<string name="ViewerDownloadURL">https://www.firestormviewer.org/choose-your-platform/</string>
<string name="ViewerDownloadURL">https://wiki.avataresargentinos.com.ar/descargas/</string>
<string name="LoginFailedViewerNotPermitted">
The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
https://www.firestormviewer.org/choose-your-platform/
https://wiki.avataresargentinos.com.ar/descargas/
For more information, see our FAQ below:
http://secondlife.com/viewer-access-faq</string>
@@ -402,7 +402,7 @@ are allowed.
<string name="ReleaseNotes">Release Notes</string>
<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
<string name="RELEASE_NOTES_BASE_URL" translate="false">https://wiki.firestormviewer.org/changelog:firestorm_change_log_</string>
<string name="RELEASE_NOTES_BASE_URL" translate="false">https://wiki.avataresargentinos.com.ar</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>
@@ -443,7 +443,7 @@ are allowed.
<string name="AssetUploadServerUnavaliable">Service not available or upload timeout was reached.</string>
<string name="AssetUploadRequestInvalid">
Error in upload request. Please visit
https://www.firestormviewer.org/support for help fixing this problem.
https://wiki.avataresargentinos.com.ar for help fixing this problem.
</string>
<!-- Settings errors -->
@@ -985,7 +985,8 @@ If you continue to receive this message, please contact Second Life support for
<string name="InvFolder Friends">Friends</string>
<string name="InvFolder All">All</string>
<!-- Virtual Firestorm system folders -->
<!-- Virtual Puma/Firestorm system folders -->
<string name="InvFolder #Puma">#Puma</string>
<string name="InvFolder #Firestorm">#Firestorm</string>
<string name="InvFolder #Phoenix">#Phoenix</string>
<string name="InvFolder #RLV">#RLV</string>
@@ -2737,7 +2738,7 @@ name="Command_360_Capture_Label">360° Snapshot</string>
<!-- Ansariel: Renamed for FS (FIRE-5019)
<string name="Command_Voice_Label">Voice settings</string>-->
<string name="Command_Voice_Label">Nearby voice</string>
<!-- Firestorm commands -->
<!-- Puma commands -->
<string name="Command_Quickprefs_Label">Quick prefs</string>
<string name="Command_AO_Label">Animation overrider</string>
<string name="Command_Webbrowser_Label">Web browser</string>
@@ -2806,7 +2807,7 @@ name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image</string
<string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
<string name="Command_View_Tooltip">Changing camera angle</string>
<string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
<!-- Firestorm commands -->
<!-- Puma commands -->
<string name="Command_Quickprefs_Tooltip">Quick preferences for changing often used settings</string>
<string name="Command_AO_Tooltip">Animation overrider</string>
<string name="Command_Webbrowser_Tooltip">Opens the internal web browser (CTRL+SHIFT+Z)</string>
@@ -3058,7 +3059,7 @@ and report the problem.
<string name="FSWithHavok">with Havok support</string>
<string name="FSWithOpensim">with OpenSimulator support</string>
<!-- Firestorm search -->
<!-- Puma search -->
<string name="not_found">&apos;[TEXT]&apos; not found</string>
<string name="no_results">No results</string>
<string name="searching">Searching...</string>
@@ -3290,7 +3291,8 @@ Your current position: [AVATAR_POS]
<string name="font_fonts_celestia_medium_redux.xml">Celestia Medium Redux</string>
<string name="font_fonts_cascadia_code.xml">Cascadia Code</string>
<string name="mode_unknown">Unknown Mode</string>
<string name="mode_settings_firestorm.xml">[APP_NAME]</string>
<string name="mode_settings_puma.xml">[APP_NAME]</string>
<string name="mode_settings_firestorm.xml">Firestorm</string>
<string name="mode_settings_phoenix.xml">Phoenix</string>
<string name="mode_settings_v3.xml">[VIEWER_GENERATION]</string>
<string name="mode_settings_hybrid.xml">Hybrid</string>