diff --git a/README b/README index 8d470c1c9..17136fb37 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ as those based upon the OpenSim platform. Singularity is maintained by a small group of volunteers who can be contacted both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer @ FreeNode). Bug requests and features requests can be submitted through our -Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from +Issue Tracker (http://links.singularityviewer.org/?to=issues or from the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...) 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/cmake/Variables.cmake b/indra/cmake/Variables.cmake index ea904742e..f1ccfcd34 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -85,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(LINUX ON BOOl FORCE) + set(LINUX ON BOOL FORCE) # If someone has specified a word size, use that to determine the # architecture. Otherwise, let the architecture specify the word size. @@ -108,7 +108,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(WORD_SIZE 32) set(AUTOBUILD_PLATFORM_NAME "linux") else() - message(FATAL_ERROR "Unkown Architecture!") + message(FATAL_ERROR "Unknown Architecture!") endif (CMAKE_SIZEOF_VOID_P EQUAL 8) endif (WORD_SIZE EQUAL 32) @@ -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/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 57f624895..84b173c3f 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -736,6 +736,15 @@ std::vector LLDir::findSkinnedFilenames(const std::string& subdir, << ((constraint == CURRENT_SKIN)? "CURRENT_SKIN" : "ALL_SKINS") << LL_ENDL; + // Build results vector. + std::vector results; + // Disallow filenames that may escape subdir + if (filename.find("..") != std::string::npos) + { + LL_WARNS("LLDir") << "Ignoring potentially relative filename '" << filename << "'" << LL_ENDL; + return results; + } + // Cache the default language directory for each subdir we've encountered. // A cache entry whose value is the empty string means "not localized, // don't bother checking again." @@ -800,8 +809,6 @@ std::vector LLDir::findSkinnedFilenames(const std::string& subdir, } } - // Build results vector. - std::vector results; // The process we use depends on 'constraint'. if (constraint != CURRENT_SKIN) // meaning ALL_SKINS { 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/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/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 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/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/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/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp index b5b37bfcc..a856e4d5f 100644 --- a/indra/newview/llfloaterdirectory.cpp +++ b/indra/newview/llfloaterdirectory.cpp @@ -227,6 +227,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name) factory_map["people_panel"] = LLCallbackMap(createPeople, this); factory_map["groups_panel"] = LLCallbackMap(createGroups, this); factory_map[market_panel] = LLCallbackMap(LLPanelDirMarket::create, this); + factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this); factory_map["showcase_panel"] = LLCallbackMap(createShowcase, this); if (secondlife) { @@ -234,7 +235,6 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name) } else { - factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this); factory_map["find_all_old_panel"] = LLCallbackMap(createFindAllOld, this); } @@ -260,8 +260,11 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name) if (secondlife) { // Remove unused tabs - container->removeTabPanel(getChild("find_all_panel")); container->removeTabPanel(getChild("find_all_old_panel")); + LLPanel* p = getChild("find_all_panel"); + container->removeTabPanel(p); // This should be at the end + p->setLabel(p->getString("classic_label")); // Give it a special label + container->addTabPanel(p, p->getLabel()); } else { @@ -634,7 +637,7 @@ void LLFloaterDirectory::toggleFind(void*) || (inst.destinationGuideURL().empty() && panel == "showcase_panel")) panel = "find_all_old_panel"; } - else if (panel == "find_all_panel" || panel == "find_all_old_panel") panel = "web_panel"; + else if (panel == "find_all_old_panel") panel = "web_panel"; showPanel(panel); diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index a0a6184aa..2cd7af83f 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -58,7 +58,7 @@ // debug switches, won't work in release #ifndef LL_RELEASE_FOR_DOWNLOAD -// dump responder replies to llinfos for debugging +// dump responder replies to LL_INFOS() for debugging //#define DUMP_REPLIES_TO_LLINFOS #ifdef DUMP_REPLIES_TO_LLINFOS @@ -754,6 +754,8 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) LLScrollListCell::Params cell_params; //cell_params.font = LLFontGL::getFontSansSerif(); + // Start out right justifying numeric displays + cell_params.font_halign = LLFontGL::RIGHT; cell_params.column = "size"; cell_params.value = size; @@ -763,6 +765,8 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) cell_params.value = urls; item_params.columns.add(cell_params); + cell_params.font_halign = LLFontGL::LEFT; + // The rest of the columns are text to left justify them cell_params.column = "name"; cell_params.value = name_buf; item_params.columns.add(cell_params); @@ -854,13 +858,20 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content) if((mParcelMemoryUsed >= 0) && (mParcelMemoryMax >= 0)) { - S32 parcel_memory_available = mParcelMemoryMax - mParcelMemoryUsed; - LLStringUtil::format_map_t args_parcel_memory; args_parcel_memory["[COUNT]"] = llformat ("%d", mParcelMemoryUsed); - args_parcel_memory["[MAX]"] = llformat ("%d", mParcelMemoryMax); - args_parcel_memory["[AVAILABLE]"] = llformat ("%d", parcel_memory_available); - std::string msg_parcel_memory = LLTrans::getString("ScriptLimitsMemoryUsed", args_parcel_memory); + std::string translate_message = "ScriptLimitsMemoryUsedSimple"; + + if (0 < mParcelMemoryMax) + { + S32 parcel_memory_available = mParcelMemoryMax - mParcelMemoryUsed; + + args_parcel_memory["[MAX]"] = llformat ("%d", mParcelMemoryMax); + args_parcel_memory["[AVAILABLE]"] = llformat ("%d", parcel_memory_available); + translate_message = "ScriptLimitsMemoryUsed"; + } + + std::string msg_parcel_memory = LLTrans::getString(translate_message, args_parcel_memory); getChild("memory_used")->setValue(LLSD(msg_parcel_memory)); } @@ -1245,10 +1256,12 @@ void LLPanelScriptLimitsAttachment::setAttachmentDetails(LLSD content) element["columns"][0]["column"] = "size"; element["columns"][0]["value"] = llformat("%d", size); element["columns"][0]["font"] = "SANSSERIF"; + element["columns"][0]["halign"] = LLFontGL::RIGHT; element["columns"][1]["column"] = "urls"; element["columns"][1]["value"] = llformat("%d", urls); element["columns"][1]["font"] = "SANSSERIF"; + element["columns"][1]["halign"] = LLFontGL::RIGHT; element["columns"][2]["column"] = "name"; element["columns"][2]["value"] = name; @@ -1335,14 +1348,20 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content) if((mAttachmentMemoryUsed >= 0) && (mAttachmentMemoryMax >= 0)) { - S32 attachment_memory_available = mAttachmentMemoryMax - mAttachmentMemoryUsed; - LLStringUtil::format_map_t args_attachment_memory; args_attachment_memory["[COUNT]"] = llformat ("%d", mAttachmentMemoryUsed); - args_attachment_memory["[MAX]"] = llformat ("%d", mAttachmentMemoryMax); - args_attachment_memory["[AVAILABLE]"] = llformat ("%d", attachment_memory_available); - std::string msg_attachment_memory = LLTrans::getString("ScriptLimitsMemoryUsed", args_attachment_memory); - getChild("memory_used")->setValue(LLSD(msg_attachment_memory)); + std::string translate_message = "ScriptLimitsMemoryUsedSimple"; + + if (0 < mAttachmentMemoryMax) + { + S32 attachment_memory_available = mAttachmentMemoryMax - mAttachmentMemoryUsed; + + args_attachment_memory["[MAX]"] = llformat ("%d", mAttachmentMemoryMax); + args_attachment_memory["[AVAILABLE]"] = llformat ("%d", attachment_memory_available); + translate_message = "ScriptLimitsMemoryUsed"; + } + + getChild("memory_used")->setValue(LLTrans::getString(translate_message, args_attachment_memory)); } if((mAttachmentURLsUsed >= 0) && (mAttachmentURLsMax >= 0)) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 667a91893..c3178bff4 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -235,7 +235,7 @@ mIsNavMeshDirty(false) mSearchBevel->setVisible(show_search); mTextParcelName->setClickedCallback(boost::bind(onClickParcelInfo)); - mTextBalance->setClickedCallback(boost::bind(LLFloaterBuyCurrency::buyCurrency)); + mTextBalance->setClickedCallback(boost::bind(LLStatusBar::sendMoneyBalanceRequest)); // TODO: Disable buying currency when connected to non-SL grids // that don't support currency yet -- MC diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index bce3f35cf..5b22d4613 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1099,12 +1099,12 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mNeedsSkin(FALSE), mLastSkinTime(0.f), mUpdatePeriod(1), + mVisualComplexityStale(true), mFirstFullyVisible(TRUE), mFullyLoaded(FALSE), mPreviousFullyLoaded(FALSE), mFullyLoadedInitialized(FALSE), mVisualComplexity(0), - mVisualComplexityStale(TRUE), mSupportsAlphaLayers(FALSE), mLoadedCallbacksPaused(FALSE), mLastRezzedStatus(-1), @@ -7253,7 +7253,7 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o return 0; } - mVisualComplexityStale = TRUE; + mVisualComplexityStale = true; if (viewer_object->isSelected()) { @@ -7416,7 +7416,7 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object) if (attachment->isObjectAttached(viewer_object)) { - mVisualComplexityStale = TRUE; + mVisualComplexityStale = true; vector_replace_with_last(mAttachedObjectsVector,std::make_pair(viewer_object,attachment)); cleanupAttachedMesh( viewer_object ); @@ -7836,9 +7836,10 @@ void LLVOAvatar::updateRezzedStatusTimers() selfStopPhase("update_appearance_from_cof"); selfStopPhase("wear_inventory_category", false); selfStopPhase("process_initial_wearables_update", false); + + mVisualComplexityStale = true; } } - mLastRezzedStatus = rez_status; } } @@ -8970,7 +8971,10 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte S32 num_params = contents.mParamWeights.size(); ESex old_sex = getSex(); - applyParsedTEMessage(contents.mTEContents); + if (applyParsedTEMessage(contents.mTEContents) > 0 && isChanged(TEXTURE)) + { + mVisualComplexityStale = true; + } // prevent the overwriting of valid baked textures with invalid baked textures for (U8 baked_index = 0; baked_index < mBakedTextureDatas.size(); baked_index++) @@ -9872,10 +9876,6 @@ void LLVOAvatar::idleUpdateRenderCost() setDebugText(llformat("%.1f KB, %.2f m^2", mAttachmentGeometryBytes/1024.f, mAttachmentSurfaceArea)); } - if (!gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME)) - { - return; - } calculateUpdateRenderCost(); // Update mVisualComplexity if needed @@ -9928,7 +9928,6 @@ void LLVOAvatar::calculateUpdateRenderCost() if (mVisualComplexityStale) { - mVisualComplexityStale = FALSE; U32 cost = 0; LLVOVolume::texture_cost_t textures; @@ -10036,6 +10035,7 @@ void LLVOAvatar::calculateUpdateRenderCost() } mVisualComplexity = cost; + mVisualComplexityStale = false; } } 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 diff --git a/indra/newview/skins/default/xui/en-us/floater_directory.xml b/indra/newview/skins/default/xui/en-us/floater_directory.xml index 5d077dffc..e28adc65e 100644 --- a/indra/newview/skins/default/xui/en-us/floater_directory.xml +++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml @@ -72,6 +72,7 @@ None Found. +