Merge tag 'Second_Life_Release#f7672193-26.4' into 26.4

17 files changed, 1 insertions, 314 deletions

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 981c35800f..7be9a9d555 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -45,12 +45,4 @@
 		<combo_box.item label="Installér automatisk" name="Install_automatically"/>
 		<combo_box.item label="Hent og installér opdateringer manuelt" name="Install_manual"/>
 	</combo_box>
-	<text name="os_hibernation_mode">
-		Forhindr OS i at gå i dvale, hvis du ikke er væk:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Forhindrer kun OS i at gå i dvale, hvis brugeren ikke er væk">
-		<combo_box.item label="Kan gå i dvale" name="can_hibernate"/>
-		<combo_box.item label="Kan ikke gå i dvale, kan slukke skærmen" name="cant_hibernate"/>
-		<combo_box.item label="Kan ikke gå i dvale, kan ikke slukke skærmen" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index ef7ac09dba..a8509cabac 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Proxy-Einstellungen:
 	</text>
 	<button label="Proxy-Einstellungen ändern" label_selected="Durchsuchen" name="set_proxy" width="160"/>
-	<text name="os_hibernation_mode">
-		OS-Ruhezustand verhindern, wenn nicht abwesend:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Verhindert den OS-Ruhezustand nur, wenn der Benutzer nicht abwesend ist">
-		<combo_box.item label="Ruhezustand möglich" name="can_hibernate"/>
-		<combo_box.item label="Kein Ruhezustand, Bildschirm kann ausgeschaltet werden" name="cant_hibernate"/>
-		<combo_box.item label="Kein Ruhezustand, Bildschirm kann nicht ausgeschaltet werden" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
deleted file mode 100644
index 18f5f2af32..0000000000
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- height="405"
- width="900"
- layout="topleft"
- name="floater_add_payment_method"
- single_instance="true"
- show_title="false"
- legacy_header_height="0"
- header_height="0"
- background_visible="false"
- can_resize="false"
- can_drag_on_left="false"
- can_minimize="false"
- can_close="false">
-  <floater.string
-    name="continue_url">
-    https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1
-  </floater.string>
-    <floater.string
-      name="continue_staging_url">
-      https://secondlife-staging.com/my/lindex/buy.php?associate_for_viewer=1
-    </floater.string>
-  <panel
-   background_opaque="false"
-   bg_alpha_color="PanelGray"
-   border_visible="false"
-   background_visible="true"
-   label="wrapper_panel"
-   layout="topleft"
-   left="0"
-   name="wrapper_panel"
-   top="0"
-   height="405"
-   width="900"
-   follows="all"
-   translate="false">
-    <text
-     type="string"
-     length="1"
-     follows="top|left|right"
-     font="SansSerifLargeBold"
-     text_color="White"
-     layout="topleft"
-     left="0"
-     height="14"
-     top_pad="30"
-     width="900"
-     halign="center"
-     name="title_txt">
-      Add a payment method to buy Linden dollars and enjoy more of Second Life.
-    </text>
-    <button
-     follows="top|left|right"
-     height="24"
-     label="Get started"
-     layout="topleft"
-     left="320"
-     name="continue_btn"
-     image_unselected="PushButton_Login"
-     image_pressed="PushButton_Login_Pressed"
-     image_hover_unselected="PushButton_Login_Over"
-     label_color="White"
-     top_pad ="15"
-     pad_bottom="1"
-     width="140"/>
-    <button
-     follows="top|left|right"
-     height="24"
-     label="Later"
-     layout="topleft"
-     left_pad="9"
-     pad_bottom="1"
-     name="close_btn"
-     width="90"/>
-    <icon
-     height="195"
-     width="260" 
-     image_name="add_payment_image_left"
-     layout="topleft"
-     left="30"
-     name="image_left"
-     top_pad="30"
-     use_draw_context_alpha="false"/>
-    <icon
-     height="195"
-     width="260"
-     image_name="add_payment_image_center"
-     layout="topleft"
-     left_pad="30"
-     name="image_center"
-     use_draw_context_alpha="false"/>
-    <icon
-     height="195"
-     width="260"
-     image_name="add_payment_image_right"
-     layout="topleft"
-     left_pad="30"
-     name="image_right"
-     use_draw_context_alpha="false"/>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     text_color="White"
-     height="75"
-     width="260"
-     top_pad="15"
-     layout="topleft"
-     word_wrap="true"
-     left="30"
-     name="image_left_desc">
-      Create an avatar you love. Choose from millions of items in stores and the Second Life Marketplace. Your style is here.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     text_color="White"
-     height="75"
-     width="260"
-     layout="topleft"
-     word_wrap="true"
-     left_pad="30"
-     name="image_center_desc">
-      Donate to your favorite performers and hosts. Your support helps them create great experiences.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     text_color="White"
-     height="75"
-     width="260"
-     layout="topleft"
-     word_wrap="true"
-     left_pad="30"
-     name="image_right_desc">
-      Make the home of your dreams. With millions of items available to purchase, you can make your retreat unique.
-    </text>
-  </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index d5f2f69df7..836c6094c5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -246,41 +246,4 @@
     <button.commit_callback
 		  function="Pref.Proxy" />
   </button>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="os_hibernation_mode"
-     mouse_opaque="false"
-     top_pad="8"
-     width="300">
-    Prevent OS from hibernating if not Away:
-  </text>
-  <combo_box
-     control_name="OSHibernationMode"
-     follows="left|top"
-     height="23"
-     layout="topleft"
-     left_delta="50"
-     top_pad="10"
-     name="os_hibernation_combobox"
-     width="300"
-     tool_tip="Only prevents OS from sleeping if user is not away">
-        <combo_box.item
-         label="Can hibernate"
-         name="can_hibernate"
-         value="0" />
-        <combo_box.item
-         label="Can't hibernate, can turn screen off"
-         name="cant_hibernate"
-         value="1" />
-        <combo_box.item
-         label="Can't hibernate, can't turn screen off"
-         name="cant_hibernate_screen"
-         value="2" />
-  </combo_box>
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 1a978a7629..54e9eca19a 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -250,7 +250,7 @@
       name="compile_target_lsl2"
       value="lsl2" />
     <combo_box.item
-      label="LSL on Lua"
+      label="LSL on Luau"
       name="compile_target_lsl_luau"
       value="lsl-luau" />
     <combo_box.item
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 27b3c407cf..36888850c4 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Configuración de proxy:
 	</text>
 	<button label="Ajustar la configuración de proxy" label_selected="Elegir" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		Evitar que el sistema entre en hibernación si no está Ausente:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Solo evita que el sistema entre en suspensión si el usuario no está ausente">
-		<combo_box.item label="Puede hibernar" name="can_hibernate"/>
-		<combo_box.item label="No puede hibernar, puede apagar la pantalla" name="cant_hibernate"/>
-		<combo_box.item label="No puede hibernar, no puede apagar la pantalla" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 60cbe93e6e..c010fa9e90 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Paramètres de proxy :
 	</text>
 	<button label="Définir" label_selected="Parcourir" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		Empêcher l’OS d’hiberner si vous n’êtes pas absent :
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Empêche seulement la mise en veille de l’OS si l’utilisateur n’est pas absent">
-		<combo_box.item label="Peut hiberner" name="can_hibernate"/>
-		<combo_box.item label="Ne peut pas hiberner, peut éteindre l’écran" name="cant_hibernate"/>
-		<combo_box.item label="Ne peut pas hiberner, ne peut pas éteindre l’écran" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 95ecf05617..c9d90539e1 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Impostazioni proxy:
 	</text>
 	<button label="Regola impostazioni proxy" label_selected="Sfoglia" name="set_proxy" width="160"/>
-	<text name="os_hibernation_mode">
-		Impedisci al sistema operativo di ibernarsi se non sei Assente:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Impedisce al sistema operativo di andare in sospensione solo se l'utente non è assente">
-		<combo_box.item label="Può ibernarsi" name="can_hibernate"/>
-		<combo_box.item label="Non può ibernarsi, può spegnere lo schermo" name="cant_hibernate"/>
-		<combo_box.item label="Non può ibernarsi, non può spegnere lo schermo" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
deleted file mode 100644
index b420bf7d20..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_add_payment_method">
-	<floater.string name="continue_url">
-		https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1&amp;lang=ja-JP
-	</floater.string>
-	<panel label="wrapper_panel" name="wrapper_panel">
-		<text name="title_txt">
-			支払い方法を追加してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。
-		</text>
-		<button label="始めましょう" name="continue_btn"/>
-		<button label="また後で"/>
-		<icon name="image_left"/>
-		<icon name="image_center"/>
-		<icon name="image_right"/>
-		<text name="image_left_desc">
-			お気に入りのアバターを作成しましょう。ストアやSecond Lifeマーケットプレイスにある何百万ものアイテムからお選びください。あなただけのスタイルがここにあります。
-		</text>
-		<text name="image_center_desc">
-			お気に入りのパフォーマーやホストに寄付をしましょう。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。
-		</text>
-		<text name="image_right_desc">
-			あなたの夢の家を作りましょう。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。
-		</text>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 8940ca5bc9..959f827a61 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		プロキシ設定：
 	</text>
 	<button label="プロキシ設定を調整" label_selected="参照" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		離席中でない場合、OS の休止状態を防止:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="ユーザーが離席中でない場合にのみ、OS のスリープを防止します">
-		<combo_box.item label="休止状態を許可" name="can_hibernate"/>
-		<combo_box.item label="休止状態を禁止（画面オフは可）" name="cant_hibernate"/>
-		<combo_box.item label="休止状態を禁止（画面オフも不可）" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml b/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml
deleted file mode 100644
index 2ef78d3d35..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_add_payment_method">
-	<panel name="wrapper_panel">
-		<text name="title_txt">
-			Dodaj metodę płatności, aby kupić Lindeny i lepiej doświadczać Second Life.
-		</text>
-		<button label="Rozpocznij" name="continue_btn" />
-		<button label="Później" name="close_btn" />
-		<text name="image_left_desc">
-			Stwórz awatara, którego pokochasz. Wybieraj spośród milionów sklepów i Second Life Marketplace. Twój styl jest tutaj.
-		</text>
-		<text name="image_center_desc">
-			Wspieraj swoich ulubionych wykonawców i gospodarzy. Pomożesz im tworzyć wspaniałe doświadczenia.
-		</text>
-		<text name="image_right_desc">
-			Stwórz dom swoich marzeń. Miliony przedmiotów dostępnych do kupienia mogą uczynić Twoje gniazdko wyjątkowym.
-		</text>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index 7147f024cb..bd36f10509 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -33,12 +33,4 @@
 		Ustawienia proxy:
 	</text>
 	<button label="Dostosuj ustawienia" label_selected="Przeglądaj" name="set_proxy" />
-	<text name="os_hibernation_mode">
-		Zapobiegaj hibernacji systemu, gdy użytkownik nie jest AFK:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Zapobiega usypianiu systemu tylko wtedy, gdy użytkownik nie jest AFK">
-		<combo_box.item label="Może hibernować" name="can_hibernate"/>
-		<combo_box.item label="Nie może hibernować, może wyłączyć ekran" name="cant_hibernate"/>
-		<combo_box.item label="Nie może hibernować, nie może wyłączyć ekranu" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 101f58488d..56fc225bc0 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Configurações de proxy:
 	</text>
 	<button label="Ajustar configurações de proxy" label_selected="Procurar" name="set_proxy" width="180"/>
-	<text name="os_hibernation_mode">
-		Impedir que o sistema entre em hibernação se não estiver Ausente:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Só impede que o sistema entre em suspensão se o utilizador não estiver ausente">
-		<combo_box.item label="Pode hibernar" name="can_hibernate"/>
-		<combo_box.item label="Não pode hibernar, pode desligar o ecrã" name="cant_hibernate"/>
-		<combo_box.item label="Não pode hibernar, não pode desligar o ecrã" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/settings_comments.xml b/indra/newview/skins/default/xui/pt/settings_comments.xml
index 22f6487847..63d68a3f5b 100644
--- a/indra/newview/skins/default/xui/pt/settings_comments.xml
+++ b/indra/newview/skins/default/xui/pt/settings_comments.xml
@@ -1435,8 +1435,6 @@
   <string>Número de logins bem-sucedidos no Second Life.</string>
   <key>NvAPICreateApplicationProfile</key>
   <string>Criar perfil de aplicativo NVIDIA para configurações otimizadas.</string>
-  <key>OSHibernationMode</key>
-  <string>Se deve impedir que o SO hiberne. 0 - pode hibernar; 1 - não pode hibernar, pode desligar a tela; 2 - não pode hibernar, não pode desligar a tela.</string>
   <key>ObjectCacheEnabled</key>
   <string>Ativar o cache de objetos.</string>
   <key>ObjectCostHighColor</key>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index cec72ebe21..137e047d97 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Настройки прокси-сервера:
 	</text>
 	<button label="Задать настройки" label_selected="Обзор" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		Предотвращать гибернацию ОС, если пользователь не отошел:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Предотвращает переход ОС в сон, только если пользователь не отошел">
-		<combo_box.item label="Гибернация разрешена" name="can_hibernate"/>
-		<combo_box.item label="Гибернация запрещена, экран можно выключать" name="cant_hibernate"/>
-		<combo_box.item label="Гибернация запрещена, экран нельзя выключать" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index a3d99ac01f..a20d0e5ff1 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		Proxy Ayarları:
 	</text>
 	<button label="Proxy ayarlarını yap" label_selected="Gözat" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		Uzakta değilse işletim sisteminin hazırda beklemesini engelle:
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="Yalnızca kullanıcı uzakta değilse işletim sisteminin uykuya geçmesini engeller">
-		<combo_box.item label="Hazırda bekleyebilir" name="can_hibernate"/>
-		<combo_box.item label="Hazırda bekleyemez, ekran kapanabilir" name="cant_hibernate"/>
-		<combo_box.item label="Hazırda bekleyemez, ekran kapanamaz" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index c83a7512e0..6ef25ad96e 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -36,12 +36,4 @@
 		代理伺服器設定：
 	</text>
 	<button label="調整代理伺服器設定" label_selected="瀏覽" name="set_proxy"/>
-	<text name="os_hibernation_mode">
-		不處於離開狀態時阻止作業系統休眠：
-	</text>
-	<combo_box name="os_hibernation_combobox" tool_tip="僅在使用者不處於離開狀態時阻止作業系統睡眠">
-		<combo_box.item label="可休眠" name="can_hibernate"/>
-		<combo_box.item label="不可休眠，可關閉螢幕" name="cant_hibernate"/>
-		<combo_box.item label="不可休眠，不可關閉螢幕" name="cant_hibernate_screen"/>
-	</combo_box>
 </panel>