diff options
Diffstat (limited to 'indra/newview/skins')
12 files changed, 26 insertions, 59 deletions
| diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 57dbaa0ea6..3da2bb5c3c 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1619,10 +1619,6 @@ Geben Sie das Objekt zum Verkauf frei und versuchen Sie es erneut.  		Möchten Sie Ihren Internetbrowser öffnen, um diesen Inhalt anzuzeigen?  		<usetemplate ignoretext="Meinen Browser starten, um eine Webseite anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		Der UI-Größenfaktor des Systems hat sich seit der letzten Ausführung geändert. Möchten Sie die Seite mit den UI-Größeneinstellungen öffnen? -		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihr Konto zu verwalten?  		<usetemplate ignoretext="Meinen Browser starten, um mein Konto zu verwalten" name="okcancelignore" notext="Abbrechen" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index c2500951a6..bec484a5ea 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -357,6 +357,18 @@      tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."      width="315" /> +  <check_box +    control_name="RenderHiDPI" +    height="16" +    initial_value="true" +    label="Enable support for HiDPI displays (requires restart)" +    layout="topleft" +    left="30" +    top_delta="16" +    name="use HiDPI" +    tool_tip="Enable OpenGL for High-Resolution Drawing." +    width="315" /> +    <text      type="string"      length="1" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d4f60078ad..121914b1cb 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3938,18 +3938,6 @@ Do you want to open your Web browser to view this content?    <notification     icon="alertmodal.tga" -   name="SystemUIScaleFactorChanged" -   type="alertmodal"> -System UI size factor has changed since last run. Do you want to open UI size adjustment settings page? -    <tag>confirm</tag> -    <usetemplate -     name="okcancelbuttons" -     notext="Cancel" -     yestext="OK"/> -  </notification> - -  <notification -   icon="alertmodal.tga"     name="WebLaunchJoinNow"     type="alertmodal">  Go to your [http://secondlife.com/account/ Dashboard] to manage your account? diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 8c769d87de..67b99ca588 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -603,11 +603,10 @@               layout="topleft"  			 label_width="205"               left="10" -             max_val="9999" -             min_val="-9999" +             max_val="360" +             min_val="-360"               name="TexRot"               width="265" /> -              <spinner               follows="left|top"               height="19" @@ -617,6 +616,7 @@               layout="topleft"               left="10"               min_val="-1" +             max_val="1"               name="TexOffsetU"               width="265" />              <spinner @@ -628,6 +628,7 @@               layout="topleft"               left="10"               min_val="-1" +             max_val="1"               name="TexOffsetV"               width="265" />              <spinner @@ -667,10 +668,9 @@  			 label_width="205"               left="10"               max_val="360" -             min_val="0" +             min_val="-360"               name="bumpyRot"               width="265" /> -              <spinner               follows="left|top"               height="19" @@ -679,7 +679,8 @@               label_width="205"               layout="topleft"               left="10" -             min_val="0" +             min_val="-1" +             max_val="1"               name="bumpyOffsetU"               width="265" />              <spinner @@ -690,7 +691,8 @@               label_width="205"               layout="topleft"               left="10" -             min_val="0" +             min_val="-1" +             max_val="1"               name="bumpyOffsetV"               width="265" />              <spinner @@ -730,10 +732,9 @@  			 label_width="205"               left="10"               max_val="360" -             min_val="0" +             min_val="-360"               name="shinyRot"               width="265" /> -              <spinner               follows="left|top"               height="19" @@ -742,7 +743,8 @@               label_width="205"               layout="topleft"               left="10" -             min_val="0" +             min_val="-1" +             max_val="1"               name="shinyOffsetU"               width="265" />              <spinner @@ -753,7 +755,8 @@               label_width="205"               layout="topleft"               left="10" -             min_val="0" +             min_val="-1" +             max_val="1"               name="shinyOffsetV"               width="265" />              <check_box diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 7b1185c4c3..92c3864f62 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1610,10 +1610,6 @@ Por favor, pon en venta el objeto y vuelve a intentarlo.  		¿Quieres abrir tu navegador para ver este contenido?  		<usetemplate ignoretext="Abrir mi navegador para ver una página web" name="okcancelignore" notext="Cancelar" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		El factor de tamaño de IU del sistema ha cambiado desde la última ejecución. ¿Deseas abrir la página de ajustes de tamaño de la IU? -		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		¿Ir al [http://secondlife.com/account/ Panel de Control] para administrar tu cuenta?  		<usetemplate ignoretext="Abrir mi navegador para administrar mi cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index a09a6a9aad..1e6c481293 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1602,10 +1602,6 @@ Veuillez choisir un objet à vendre et réessayer.  		Voulez-vous ouvrir votre navigateur web système pour afficher ce contenu ?  		<usetemplate ignoretext="Ouvrir mon navigateur pour consulter une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		Le facteur de taille de l’interface système a changé depuis la dernière exécution. Voulez-vous ouvrir la page des paramètres d’ajustement de la taille de l’interface ? -		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Accéder à votre [http://secondlife.com/account/ Page d'accueil] pour gérer votre compte ?  		<usetemplate ignoretext="Lancer mon navigateur pour gérer mon compte" name="okcancelignore" notext="Annuler" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 8a057914ac..0175275eb3 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1605,10 +1605,6 @@ Imposta l'oggetto per la vendita e riprova.  		Vuoi aprire il browser per vedere questi contenuti?  		<usetemplate ignoretext="Lancia il browser per consultare una pagina web" name="okcancelignore" notext="Annulla" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		Il fattore dimensioni UI del sistema è cambiato rispetto all'ultima sessione. Vuoi aprire la pagina delle impostazioni di regolazione delle dimensioni UI? -		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Vuoi andare su [http://secondlife.com/account/ Dashboard] per gestire il tuo account?  		<usetemplate ignoretext="Lancia il browser per gestire il mio account" name="okcancelignore" notext="Annulla" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index fc6c951a55..315e35bc41 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1636,10 +1636,6 @@ SHA1 フィンガープリント: [MD5_DIGEST]  		Web ブラウザを開いてこのコンテンツを表示しますか?  		<usetemplate ignoretext="ブラウザを起動して Web ページを見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		前回実行時からシステム UI サイズ係数が変更されています。UI サイズ調整設定ページを開きますか? -		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウントを管理しますか?  		<usetemplate ignoretext="ブラウザを起動してアカウントを管理するとき" name="okcancelignore" notext="取り消し" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index b4cf0a1b20..b7a057e769 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1596,10 +1596,6 @@ Por favor, ponha o objeto à venda e tente novamente.  		Abrir uma janela do navegador para ver essas informações?  		<usetemplate ignoretext="Abrir o navegador para acessar uma página na web" name="okcancelignore" notext="Cancelar" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		O fator de tamanho da interface do sistema foi alterado desde a última execução. Deseja abrir a página de configurações de ajuste de tamanho da interface? -		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Deseja abrir o [http://secondlife.com/account/ Painel] para gerenciar sua conta?  		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index d6866b6489..4801c22cc6 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -1604,10 +1604,6 @@  		Открыть браузер для просмотра этого контента?  		<usetemplate ignoretext="Запустить браузер для просмотра веб-страницы" name="okcancelignore" notext="Отмена" yestext="OK"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		Со времени последнего запуска изменился системный коэффициент размера интерфейса. Открыть страницу настроек размера интерфейса? -		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Перейти на [http://secondlife.com/account/ информационную панель] для управления вашим аккаунтом?  		<usetemplate ignoretext="Запустить браузер для управления аккаунтом" name="okcancelignore" notext="Отмена" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index fce5bbfcab..291f8539b3 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -1605,10 +1605,6 @@ Nesneyi satılık olarak ayarlayıp tekrar deneyin.  		Bu içeriği görüntülemek için Web tarayıcınızı açmak istiyor musunuz?  		<usetemplate ignoretext="Bir web sayfasını görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		Sistem kullanıcı arayüzü faktörü son çalıştırmadan bu yana değişti. Kullanıcı arayüzü büyüklük değiştirme ayarları sayfasını açmak istiyor musunuz? -		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		Hesabınızı yönetmek için [http://secondlife.com/account/ Kontrol Paneli] adresine gidilsin mi?  		<usetemplate ignoretext="Hesabımı yönetmek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 120ed1e7d2..e8b2481a7c 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -1601,10 +1601,6 @@ SHA1 指紋:[MD5_DIGEST]  		你確定要開啟網頁瀏覽器去察看這個內容?  		<usetemplate ignoretext="啟動我的網頁瀏覽器去察看網頁" name="okcancelignore" notext="取消" yestext="確定"/>  	</notification> -	<notification name="SystemUIScaleFactorChanged"> -		系統使用者介面的尺寸倍數自從上次執行後已經改變。 你想要開啟使用者介面尺寸調整的設定頁嗎? -		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> -	</notification>  	<notification name="WebLaunchJoinNow">  		前往你的[http://secondlife.com/account/ 塗鴉牆]以進行管理你的帳戶?  		<usetemplate ignoretext="啟動我的瀏覽器以管理我的帳戶" name="okcancelignore" notext="取消" yestext="確定"/> | 
