livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce VIEWER_GENERATION as default substitution for LL's viewer generation

master
Ansariel 2017-01-30 19:51:15 +01:00
parent 74297fcee8
commit 6534c4be0e
12 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llappviewer.cpp
View File

@ -489,6 +489,7 @@ void init_default_trans_args()
// files. We really only want to have to maintain a single copy of it.
default_trans_args.insert("create_account_url");
default_trans_args.insert("DOWNLOAD_URL"); //<FS:CR> Viewer download url
default_trans_args.insert("VIEWER_GENERATION"); // <FS:Ansariel> Viewer generation (major version number)
}
//----------------------------------------------------------------------------

2
indra/newview/skins/default/xui/en/panel_fs_login.xml
View File

@ -296,7 +296,7 @@
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item

2
indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
View File

@ -316,7 +316,7 @@
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item

3
indra/newview/skins/default/xui/en/strings.xml
View File

@ -13,6 +13,7 @@
<string name="SUPPORT_SITE">Second Life Support Portal</string>
<string name="DOWNLOAD_URL">http://www.firestormviewer.org/downloads</string>
<string name="CURRENT_GRID"/> <!-- Will be set in fsgridhandler.cpp / llviewernetwork.cpp -->
<string name="VIEWER_GENERATION">Viewer 5</string>
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
@ -3043,7 +3044,7 @@ Try enclosing path to the editor with double quotes.
<string name="mode_unknown">Unknown Mode</string>
<string name="mode_settings_firestorm.xml">Firestorm</string>
<string name="mode_settings_phoenix.xml">Phoenix</string>
<string name="mode_settings_v3.xml">Viewer 5</string>
<string name="mode_settings_v3.xml">[VIEWER_GENERATION]</string>
<string name="mode_settings_hybrid.xml">Hybrid</string>
<string name="mode_settings_latency.xml">Latency</string>
<string name="mode_settings_text.xml">Text</string>

1
indra/newview/skins/default/xui/es/panel_fs_login.xml
View File

@ -49,7 +49,6 @@
<combo_box name="mode_combo" tool_tip="Selecciona con qué estilo de visor estás más familiarizado para establecer tus opciones por defecto apropiadamente.">
<combo_box.item label="Firestorm" name="Firestorm"/>
<combo_box.item label="Phoenix" name="Phoenix"/>
<combo_box.item label="Viewer 5" name="V3"/>
<combo_box.item label="Híbrido" name="Hybrid"/>
</combo_box>
</layout_panel>

1
indra/newview/skins/default/xui/ja/panel_fs_login.xml
View File

@ -51,7 +51,6 @@
<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
<combo_box.item label="Firestorm" name="Firestorm"/>
<combo_box.item label="Phoenix" name="Phoenix"/>
<combo_box.item label="Viewer 5" name="V3"/>
<combo_box.item label="Hybrid" name="Hybrid"/>
<combo_box.item label="Latency" name="Latency"/>
</combo_box>

1
indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
View File

@ -49,7 +49,6 @@
<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
<combo_box.item label="Firestorm" name="Firestorm" />
<combo_box.item label="Phoenix" name="Phoenix" />
<combo_box.item label="Viewer 5" name="V3" />
<combo_box.item label="ハイブリッド" name="Hybrid" />
<combo_box.item label="Latency" name="Latency" />
<combo_box.item label="テキスト" name="Text" />

2
indra/newview/skins/latency/xui/en/panel_fs_login.xml
View File

@ -311,7 +311,7 @@
/>
<combo_box.item
name="V3"
label="Viewer 5"
label="[VIEWER_GENERATION]"
value="settings_v3.xml"
/>
<combo_box.item

2
indra/newview/skins/starlight/xui/en/panel_fs_login.xml
View File

@ -296,7 +296,7 @@
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item

2
indra/newview/skins/starlight/xui/en/panel_fs_nui_login.xml
View File

@ -316,7 +316,7 @@
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item

2
indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
View File

@ -295,7 +295,7 @@ tool_tip="The account name you chose when you registered, like bobsmith420 or St
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item

2
indra/newview/skins/starlightcui/xui/en/panel_fs_nui_login.xml
View File

@ -316,7 +316,7 @@
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 5"
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item