From c92ccf8a44ca323d9ce14041dec6f7c881fa65b2 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 21 Feb 2017 02:23:19 -0500 Subject: [PATCH 01/13] Branding shtuffs for the Singularity --- indra/cmake/Variables.cmake | 2 ++ indra/lib/python/indra/util/llmanifest.py | 1 + indra/newview/CMakeLists.txt | 4 ++++ indra/newview/installers/windows/lang_da.nsi | 8 ++++---- indra/newview/installers/windows/lang_de.nsi | 8 ++++---- indra/newview/installers/windows/lang_es.nsi | 8 ++++---- indra/newview/installers/windows/lang_fr.nsi | 8 ++++---- indra/newview/installers/windows/lang_it.nsi | 8 ++++---- indra/newview/installers/windows/lang_pl.nsi | 8 ++++---- indra/newview/installers/windows/lang_pt-br.nsi | 8 ++++---- indra/newview/installers/windows/lang_ru.nsi | 8 ++++---- indra/newview/installers/windows/lang_tr.nsi | 8 ++++---- indra/newview/installers/windows/lang_zh.nsi | 8 ++++---- indra/newview/llappviewer.cpp | 2 +- indra/newview/llfloaterabout.cpp | 2 +- indra/newview/viewer_manifest.py | 11 +++++++---- 16 files changed, 56 insertions(+), 46 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index ea904742e..a422680e3 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -189,6 +189,8 @@ set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name") string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL}) set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.") +set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id") + set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 8d9656778..5cd8220aa 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -106,6 +106,7 @@ ARGUMENTS=[ Example use: %(name)s --arch=i686 On Linux this would try to use Linux_i686Manifest.""", default=""), + dict(name='branding_id', description="Identifier for the branding set to use.", default='singularity'), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None), dict(name='configuration', diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 1b28fcdca..573d0962c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1538,6 +1538,7 @@ if (WINDOWS) --actions=copy --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --configuration=${CMAKE_CFG_INTDIR} @@ -1592,6 +1593,7 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --channel=${VIEWER_CHANNEL} @@ -1689,6 +1691,7 @@ if (LINUX) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --channel=${VIEWER_CHANNEL} @@ -1712,6 +1715,7 @@ if (LINUX) --arch=${ARCH} --actions=copy --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --configuration=${CMAKE_CFG_INTDIR} diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi index 11807202d..87e88492e 100644 --- a/indra/newview/installers/windows/lang_da.nsi +++ b/indra/newview/installers/windows/lang_da.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_DANISH} "Det ser ud til at ${APPNAME} ${VERSI LangString MissingSSE2 ${LANG_DANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." -LangString CloseSecondLifeInstMB ${LANG_DANISH} "Singularity kan ikke installeres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." +LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at ${APPNAME} skal lukke ned..." +LangString CloseSecondLifeInstMB ${LANG_DANISH} "${APPNAME} kan ikke installeres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." -LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "Singularity kan ikke afinstalleres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." +LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at ${APPNAME} skal lukke ned..." +LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "${APPNAME} kan ikke afinstalleres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..." diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi index 763f88488..a9d99fb74 100644 --- a/indra/newview/installers/windows/lang_de.nsi +++ b/indra/newview/installers/windows/lang_de.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist ${APPNAME} ${VERSION LangString MissingSSE2 ${LANG_GERMAN} "Dieser PC besitzt möglicherweise keinen Prozessor mit SSE2-Unterstützung, die für die Ausführung von ${APPNAME} ${VERSION_LONG} benötigt wird. Trotzdem installieren?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." -LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Singularity kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Singularity zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." +LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..." +LangString CloseSecondLifeInstMB ${LANG_GERMAN} "${APPNAME} kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um ${APPNAME} zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." -LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Singularity kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Singularity zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." +LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..." +LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "${APPNAME} kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um ${APPNAME} zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_GERMAN} "Prüfe Netzwerkverbindung..." diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi index b940e04c9..f4dd51a59 100644 --- a/indra/newview/installers/windows/lang_es.nsi +++ b/indra/newview/installers/windows/lang_es.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_SPANISH} "Parece que ${APPNAME} ${VERSION_LON LangString MissingSSE2 ${LANG_SPANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." -LangString CloseSecondLifeInstMB ${LANG_SPANISH} "Singularity no se puede instalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar Singularity y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la instalación." +LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} se cierre..." +LangString CloseSecondLifeInstMB ${LANG_SPANISH} "${APPNAME} no se puede instalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar ${APPNAME} y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la instalación." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." -LangString CloseSecondLifeUnInstMB ${LANG_SPANISH} "Singularity no se puede desinstalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar Singularity y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la desinstalación." +LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} se cierre..." +LangString CloseSecondLifeUnInstMB ${LANG_SPANISH} "${APPNAME} no se puede desinstalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar ${APPNAME} y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la desinstalación." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_SPANISH} "Comprobando la conexión de red..." diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi index 095847082..6e11ffa6d 100644 --- a/indra/newview/installers/windows/lang_fr.nsi +++ b/indra/newview/installers/windows/lang_fr.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_FRENCH} "Il semblerait que vous ayez déjà i LangString MissingSSE2 ${LANG_FRENCH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." -LangString CloseSecondLifeInstMB ${LANG_FRENCH} "Singularity ne peut pas être installé si l'application est déjà lancée..$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer Singularity et continuer.$\nSélectionnez ANNULER pour annuler l'installation." +LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_FRENCH} "${APPNAME} ne peut pas être installé si l'application est déjà lancée..$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer ${APPNAME} et continuer.$\nSélectionnez ANNULER pour annuler l'installation." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_FRENCH} "Singularity ne peut pas être désinstallé si l'application est déjà lancée.$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer Singularity et continuer.$\nSélectionnez ANNULER pour annuler la désinstallation." +LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_FRENCH} "${APPNAME} ne peut pas être désinstallé si l'application est déjà lancée.$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer ${APPNAME} et continuer.$\nSélectionnez ANNULER pour annuler la désinstallation." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_FRENCH} "Connexion au réseau en cours de vérification..." diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi index 8153b73d4..465b13709 100644 --- a/indra/newview/installers/windows/lang_it.nsi +++ b/indra/newview/installers/windows/lang_it.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_ITALIAN} "${APPNAME} ${VERSION_LONG} è stato LangString MissingSSE2 ${LANG_ITALIAN} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che Singularity chiuda…" -LangString CloseSecondLifeInstMB ${LANG_ITALIAN} "Non è possibile installare Singularity se è già in funzione..$\n$\nTermina le operazioni in corso e scegli OK per chiudere Singularity e continuare.$\nScegli CANCELLA per annullare l’installazione." +LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che ${APPNAME} chiuda…" +LangString CloseSecondLifeInstMB ${LANG_ITALIAN} "Non è possibile installare ${APPNAME} se è già in funzione..$\n$\nTermina le operazioni in corso e scegli OK per chiudere ${APPNAME} e continuare.$\nScegli CANCELLA per annullare l’installazione." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di Singularity…" -LangString CloseSecondLifeUnInstMB ${LANG_ITALIAN} "Non è possibile installare Singularity se è già in funzione.$\n$\nTermina le operazioni in corso e scegli OK per chiudere Singularity e continuare.$\nScegli CANCELLA per annullare." +LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di ${APPNAME}…" +LangString CloseSecondLifeUnInstMB ${LANG_ITALIAN} "Non è possibile installare ${APPNAME} se è già in funzione.$\n$\nTermina le operazioni in corso e scegli OK per chiudere ${APPNAME} e continuare.$\nScegli CANCELLA per annullare." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_ITALIAN} "Verifica connessione di rete in corso..." diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index 5c23d89fd..5e6c183b1 100644 --- a/indra/newview/installers/windows/lang_pl.nsi +++ b/indra/newview/installers/windows/lang_pl.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_POLISH} "${APPNAME} ${VERSION_LONG} jest już LangString MissingSSE2 ${LANG_POLISH} "Ten komputer może nie mieć procesora z obsługą SSE2, który jest wymagany aby uruchomić ${APPNAME} w wersji ${VERSION_LONG}. Chcesz kontynuować?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." -LangString CloseSecondLifeInstMB ${LANG_POLISH} "Singularity nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć Singularity i kontynuować.$\nWybierz CANCEL aby anulować instalację." +LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_POLISH} "${APPNAME} nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć ${APPNAME} i kontynuować.$\nWybierz CANCEL aby anulować instalację." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_POLISH} "Singularity nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć Singularity i kontynuować.$\nWybierz CANCEL aby anulować." +LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_POLISH} "${APPNAME} nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć ${APPNAME} i kontynuować.$\nWybierz CANCEL aby anulować." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_POLISH} "Sprawdzanie połączenia sieciowego..." diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi index 8eaed25c5..6ddbadab5 100644 --- a/indra/newview/installers/windows/lang_pt-br.nsi +++ b/indra/newview/installers/windows/lang_pt-br.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_PORTUGUESEBR} "Parece que o ${APPNAME} ${VERS LangString MissingSSE2 ${LANG_PORTUGUESEBR} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." -LangString CloseSecondLifeInstMB ${LANG_PORTUGUESEBR} "O Singularity não pode ser instalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o Singularity e continuar.$\nSelecione CANCELAR para cancelar a instalação." +LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_PORTUGUESEBR} "O ${APPNAME} não pode ser instalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o ${APPNAME} e continuar.$\nSelecione CANCELAR para cancelar a instalação." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_PORTUGUESEBR} "O Singularity não pode ser desinstalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o Singularity e continuar.$\nSelecione CANCELAR para cancelar." +LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_PORTUGUESEBR} "O ${APPNAME} não pode ser desinstalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o ${APPNAME} e continuar.$\nSelecione CANCELAR para cancelar." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_PORTUGUESEBR} "Verificando a conexão de rede..." diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi index e64e2b3e0..ed4cd47c6 100644 --- a/indra/newview/installers/windows/lang_ru.nsi +++ b/indra/newview/installers/windows/lang_ru.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_RUSSIAN} "Вероятно, версия ${AP LangString MissingSSE2 ${LANG_RUSSIAN} "Возможно, на этом компьютере нет ЦП с поддержкой SSE2, которая необходима для работы ${APPNAME} ${VERSION_LONG}. Продолжить?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." -LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки." +LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления." +LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_RUSSIAN} "Проверка подключения к сети..." diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi index 04da01bd2..262c32748 100644 --- a/indra/newview/installers/windows/lang_tr.nsi +++ b/indra/newview/installers/windows/lang_tr.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_TURKISH} "${APPNAME} ${VERSION_LONG} zaten y LangString MissingSSE2 ${LANG_TURKISH} "Bu makinede SSE2 desteğine sahip bir CPU bulunmayabilir, ${APPNAME} ${VERSION_LONG} çalıştırmak için bu gereklidir. Devam etmek istiyor musunuz?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." -LangString CloseSecondLifeInstMB ${LANG_TURKISH} "Singularity zaten çalışırken kapatılamaz.$\n$\nYaptığınız işi bitirdikten sonra Singularity'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nYüklemeyi iptal etmek için İPTAL seçimini yapın." +LangString CloseSecondLifeInstDP ${LANG_TURKISH} "${APPNAME}'ın kapatılması bekleniyor..." +LangString CloseSecondLifeInstMB ${LANG_TURKISH} "${APPNAME} zaten çalışırken kapatılamaz.$\n$\nYaptığınız işi bitirdikten sonra ${APPNAME}'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nYüklemeyi iptal etmek için İPTAL seçimini yapın." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." -LangString CloseSecondLifeUnInstMB ${LANG_TURKISH} "Singularity zaten çalışırken kaldırılamaz.$\n$\nYaptığınız işi bitirdikten sonra Singularity'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nİptal etmek için İPTAL seçimini yapın." +LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "${APPNAME}'ın kapatılması bekleniyor..." +LangString CloseSecondLifeUnInstMB ${LANG_TURKISH} "${APPNAME} zaten çalışırken kaldırılamaz.$\n$\nYaptığınız işi bitirdikten sonra ${APPNAME}'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nİptal etmek için İPTAL seçimini yapın." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_TURKISH} "Ağ bağlantısı kontrol ediliyor..." diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi index 906f036fa..10b9303c6 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_TRADCHINESE} "${APPNAME} ${VERSION_LONG} 版 LangString MissingSSE2 ${LANG_TRADCHINESE} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" -LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行安裝。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。" +LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…" +LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行安裝。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。" ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" -LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行卸載。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。" +LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…" +LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行卸載。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。" ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_TRADCHINESE} "正在檢查網路連接..." diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 19144195b..6cdf1fb46 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2434,7 +2434,7 @@ bool LLAppViewer::initConfiguration() } // XUI:translate - gSecondLife = "Singularity Viewer"; + gSecondLife = LLTrans::getString("APP_NAME"); // Read skin/branding settings if specified. //if (! gDirUtilp->getSkinDir().empty() ) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index cd2cfdb17..48bf7a836 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -362,7 +362,7 @@ void LLFloaterAbout::show(void*) static std::string get_viewer_release_notes_url() { - return "http://www.singularityviewer.org"; + return LLTrans::getString("APP_SITE"); /*std::ostringstream version; version << gVersionMajor << "." << gVersionMinor diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e21f645d6..b979b10b0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -144,6 +144,9 @@ class ViewerManifest(LLManifest): def grid(self): return self.args['grid'] + def viewer_branding_id(self): + return self.args['branding_id'] + def channel(self): return self.args['channel'] @@ -297,7 +300,7 @@ class WindowsManifest(ViewerManifest): if self.is_packaging_viewer(): # Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. - self.path(src='%s/singularity-bin.exe' % self.args['configuration'], dst=self.final_exe()) + self.path(src='%s/%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe()) # Plugin host application self.path2basename(os.path.join(os.pardir, @@ -572,7 +575,7 @@ class WindowsManifest(ViewerManifest): !define VENDORSTR "Singularity Viewer Project" """ - tempfile = "singularity_setup_tmp.nsi" + tempfile = "%s_setup_tmp.nsi" % self.viewer_branding_id() # the following replaces strings in the nsi template # it also does python-style % substitution self.replace_in("installers/windows/installer_template.nsi", tempfile, { @@ -981,7 +984,7 @@ class LinuxManifest(ViewerManifest): self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("client-readme-joystick.txt","README-linux-joystick.txt") - self.path("wrapper.sh","singularity") + self.path("wrapper.sh",self.viewer_branding_id()) if self.prefix(src="", dst="etc"): self.path("handle_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh") @@ -995,7 +998,7 @@ class LinuxManifest(ViewerManifest): # self.put_in_file(self.flags_list(), 'gridargs.dat') if self.prefix(src="", dst="bin"): - self.path("singularity-bin","do-not-directly-run-singularity-bin") + self.path("%s-bin"%self.viewer_branding_id(),"do-not-directly-run-%s-bin"%self.viewer_branding_id()) self.path2basename("../llplugin/slplugin", "SLPlugin") self.end_prefix("bin") From 2eaf9a2c223396158467a98825adbab29c4eceab Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 4 Apr 2017 21:16:29 -0400 Subject: [PATCH 02/13] Add back Latif's CMake-based branding to BuildBranding.cmake --- indra/cmake/BuildBranding.cmake | 37 +++++++++++++++++++ indra/cmake/CMakeLists.txt | 1 + .../English.lproj/InfoPlist.strings.in | 2 +- .../linux_tools/{wrapper.sh => wrapper.sh.in} | 2 +- .../res/{viewerRes.rc => viewerRes.rc.in} | 6 +-- 5 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 indra/cmake/BuildBranding.cmake rename indra/newview/linux_tools/{wrapper.sh => wrapper.sh.in} (98%) rename indra/newview/res/{viewerRes.rc => viewerRes.rc.in} (96%) diff --git a/indra/cmake/BuildBranding.cmake b/indra/cmake/BuildBranding.cmake new file mode 100644 index 000000000..b68cc7483 --- /dev/null +++ b/indra/cmake/BuildBranding.cmake @@ -0,0 +1,37 @@ +# -*- cmake -*- +if (WINDOWS) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in + ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc + ) +endif (WINDOWS) + +if (DARWIN) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in + ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings + ) +endif (DARWIN) + +if (LINUX) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in + ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh + @ONLY + ) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in + ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh + @ONLY + ) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in + ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh + @ONLY + ) + configure_file( + ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in + ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh + @ONLY + ) +endif (LINUX) diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 18a58fcba..7c8e616d6 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES Audio.cmake BasicPluginBase.cmake Boost.cmake + BuildBranding.cmake BuildVersion.cmake CARes.cmake CEFPlugin.cmake diff --git a/indra/newview/English.lproj/InfoPlist.strings.in b/indra/newview/English.lproj/InfoPlist.strings.in index e10c86335..8a2f3a381 100644 --- a/indra/newview/English.lproj/InfoPlist.strings.in +++ b/indra/newview/English.lproj/InfoPlist.strings.in @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ -CFBundleName = "${VIEWER_CHANNEL_ONE_WORD}"; +CFBundleName = "${VIEWER_CHANNEL_NOSPACE}"; CFBundleShortVersionString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"; CFBundleGetInfoString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}, Copyright 2012 Siana Gearz"; diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh.in similarity index 98% rename from indra/newview/linux_tools/wrapper.sh rename to indra/newview/linux_tools/wrapper.sh.in index 43b135a15..1c5ff1950 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh.in @@ -142,7 +142,7 @@ if [ -n "$LL_TCMALLOC" ]; then fi fi -export VIEWER_BINARY='do-not-directly-run-singularity-bin' +export VIEWER_BINARY='do-not-directly-run-@VIEWER_BRANDING_ID@-bin' BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g') if [ "${BINARY_TYPE}" == "ELF 32-bit LSB executable" ]; then SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"' diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc.in similarity index 96% rename from indra/newview/res/viewerRes.rc rename to indra/newview/res/viewerRes.rc.in index bf112c35e..97859af50 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc.in @@ -73,7 +73,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Singularity Viewer...",666,36,13,91,8 + LTEXT "Loading ${VIEWER_CHANNEL} Viewer...",666,36,13,91,8 END @@ -154,12 +154,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Siana Gearz" - VALUE "FileDescription", "Singularity Viewer" + VALUE "FileDescription", "${VIEWER_CHANNEL} Viewer" VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz" VALUE "OriginalFilename", "SingularityViewer.exe" - VALUE "ProductName", "Singularity Viewer" + VALUE "ProductName", "${VIEWER_CHANNEL} Viewer" VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" END END From bb22201f4a534caee6c9299a898aa4c2572b6803 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 4 Apr 2017 23:00:25 -0400 Subject: [PATCH 03/13] Revert the PyFx Ambient Dark and Ambient White changes Adds Ambient Not As White and Ambient Not As Dark --- .../windlight/skies/Ambient%20Dark.xml | 62 ++++---- .../skies/Ambient%20Not%20As%20Dark.xml | 141 ++++++++++++++++++ .../skies/Ambient%20Not%20As%20White.xml | 141 ++++++++++++++++++ .../windlight/skies/Ambient%20White.xml | 72 ++++----- 4 files changed, 349 insertions(+), 67 deletions(-) create mode 100644 indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml create mode 100644 indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml b/indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml index 83bd660b6..20aa5ba44 100644 --- a/indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml +++ b/indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml @@ -9,30 +9,30 @@ blue_density - 2 - 2 - 2 - 1 + 0 + 0 + 0 + 0 blue_horizon - 2 - 2 - 2 - 1 + 0 + 0 + 0 + 0 cloud_color - 0.22615400241575034 - 0.22615400241575034 - 0.22615400241575034 - 1 + 0 + 0 + 0 + 0 cloud_pos_density1 - 0 - 0 - 0 + 0.5 + 0.5 + 1 1 cloud_pos_density2 @@ -51,26 +51,26 @@ cloud_scroll_rate - 10 - 10 + 11.539999961853027 + 10.01099967956543 cloud_shadow - 0.36000001430511475 + 0 0 0 1 density_multiplier - 0 + 0.00042999998549930751 0 0 1 distance_multiplier - 3.0208916693946743e-009 + 8.1000003814697266 0 0 1 @@ -84,21 +84,21 @@ gamma - 4 + 1 0 0 1 glow - 5 + 20 0.0010000000474974513 -0 1 haze_density - 0 + 0.079999998211860657 0 0 1 @@ -106,30 +106,30 @@ haze_horizon 0 - 0.19915600437467304 - 0.19915600437467304 + 0.19915600121021271 + 0.19915600121021271 1 lightnorm -0 - 1 - 1.1483815569590661e-006 + 0.89100658893585205 + 0.45399042963981628 0 max_y - 0 + 718.70001220703125 0 0 1 preset_num - 26 + 23 star_brightness - 2 + 0 sun_angle - 1.5707951784133911 + 1.0995575189590454 sunlight_color 0 diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml b/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml new file mode 100644 index 000000000..83bd660b6 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.22615400241575034 + 0.22615400241575034 + 0.22615400241575034 + 1 + + cloud_pos_density1 + + 0 + 0 + 0 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10 + 10 + + cloud_shadow + + 0.36000001430511475 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 3.0208916693946743e-009 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 4 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600437467304 + 0.19915600437467304 + 1 + + lightnorm + + -0 + 1 + 1.1483815569590661e-006 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 26 + star_brightness + 2 + sun_angle + 1.5707951784133911 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml b/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml new file mode 100644 index 000000000..6321311a4 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml @@ -0,0 +1,141 @@ + + + ambient + + 3 + 3 + 2.9999997615814209 + 1 + + blue_density + + 0.44999999369830818 + 0.44999999398335949 + 0.4499999944309046 + 1 + + blue_horizon + + 0.23999999567946317 + 0.23999999579784967 + 0.23999999583870221 + 1 + + cloud_color + + 0.22615400241575034 + 0.22615400241575034 + 0.22615400241575034 + 1 + + cloud_pos_density1 + + 0 + 0 + 0 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10 + 10 + + cloud_shadow + + 0.36000001430511475 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 3.0208916693946743e-009 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600437467304 + 0.19915600437467304 + 1 + + lightnorm + + -0 + 1 + 1.1483815569590661e-006 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 26 + star_brightness + 2 + sun_angle + 1.5707951784133911 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20White.xml b/indra/newview/app_settings/windlight/skies/Ambient%20White.xml index 6321311a4..c30c1db26 100644 --- a/indra/newview/app_settings/windlight/skies/Ambient%20White.xml +++ b/indra/newview/app_settings/windlight/skies/Ambient%20White.xml @@ -4,79 +4,79 @@ 3 3 - 2.9999997615814209 + 3 1 blue_density - 0.44999999369830818 - 0.44999999398335949 - 0.4499999944309046 - 1 + 0 + 0 + 0 + 0 blue_horizon - 0.23999999567946317 - 0.23999999579784967 - 0.23999999583870221 - 1 + 0 + 0 + 0 + 0 cloud_color - 0.22615400241575034 - 0.22615400241575034 - 0.22615400241575034 - 1 + 0 + 0 + 0 + 0 cloud_pos_density1 - 0 - 0 - 0 + 1.6884100437164307 + 0.52609699964523315 + 0.99999999999999289 1 cloud_pos_density2 - 0.5 - 0.5 + 1.6884100437164307 + 0.52609699964523315 0.125 1 cloud_scale - 0.41999998688697815 + 0.4199999868869746 0 0 1 cloud_scroll_rate - 10 - 10 + 10.069999694824219 + 11.050000190734863 cloud_shadow - 0.36000001430511475 + 0 0 0 1 density_multiplier - 0 + 0.00089999998454004526 0 0 1 distance_multiplier - 3.0208916693946743e-009 + 0.80000001192093606 0 0 1 east_angle - 0 + 4.7123889923095703 enable_cloud_scroll 1 @@ -93,12 +93,12 @@ 5 0.0010000000474974513 - -0 + -0.47999998927116394 1 haze_density - 0 + 0.029999999329447746 0 0 1 @@ -106,30 +106,30 @@ haze_horizon 0 - 0.19915600437467304 - 0.19915600437467304 + 0.19915600121021271 + 0.19915600121021271 1 lightnorm - -0 - 1 - 1.1483815569590661e-006 + -0.99144464731216431 + 0.13052797317504883 + -1.182285913614578e-008 0 max_y - 0 + 4000 0 0 1 preset_num - 26 + 22 star_brightness - 2 + 0 sun_angle - 1.5707951784133911 + 3.0106911659240723 sunlight_color 0 From a6236ab593d160a6b6b48ad12f301a50569bd6c9 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 12 Apr 2017 19:57:52 -0400 Subject: [PATCH 04/13] Prepare for upcoming changes to Region Agent Limit --- indra/newview/skins/default/xui/en-us/panel_region_general.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en-us/panel_region_general.xml b/indra/newview/skins/default/xui/en-us/panel_region_general.xml index 8053be932..f31b776a0 100644 --- a/indra/newview/skins/default/xui/en-us/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en-us/panel_region_general.xml @@ -58,7 +58,7 @@