Permalink
Browse files

Merge branch 'master' of https://github.com/singularity-viewer/Singul…

  • Loading branch information...
Shyotl committed Oct 3, 2017
2 parents 733fca3 + 0b35781 commit 68c498163d550ce3543cdd01e98727e2c92e8e08
Showing with 511 additions and 151 deletions.
  1. +1 −1 README
  2. +37 −0 indra/cmake/BuildBranding.cmake
  3. +1 −0 indra/cmake/CMakeLists.txt
  4. +4 −2 indra/cmake/Variables.cmake
  5. +1 −0 indra/lib/python/indra/util/llmanifest.py
  6. +9 −2 indra/llvfs/lldir.cpp
  7. +4 −0 indra/newview/CMakeLists.txt
  8. +1 −1 indra/newview/English.lproj/InfoPlist.strings.in
  9. +31 −31 indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml
  10. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml
  11. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml
  12. +36 −36 indra/newview/app_settings/windlight/skies/Ambient%20White.xml
  13. +4 −4 indra/newview/installers/windows/lang_da.nsi
  14. +4 −4 indra/newview/installers/windows/lang_de.nsi
  15. +4 −4 indra/newview/installers/windows/lang_es.nsi
  16. +4 −4 indra/newview/installers/windows/lang_fr.nsi
  17. +4 −4 indra/newview/installers/windows/lang_it.nsi
  18. +4 −4 indra/newview/installers/windows/lang_pl.nsi
  19. +4 −4 indra/newview/installers/windows/lang_pt-br.nsi
  20. +4 −4 indra/newview/installers/windows/lang_ru.nsi
  21. +4 −4 indra/newview/installers/windows/lang_tr.nsi
  22. +4 −4 indra/newview/installers/windows/lang_zh.nsi
  23. +1 −1 indra/newview/linux_tools/{wrapper.sh → wrapper.sh.in}
  24. +1 −1 indra/newview/llappviewer.cpp
  25. +1 −1 indra/newview/llfloaterabout.cpp
  26. +6 −3 indra/newview/llfloaterdirectory.cpp
  27. +31 −12 indra/newview/llfloaterscriptlimits.cpp
  28. +1 −1 indra/newview/llstatusbar.cpp
  29. +10 −10 indra/newview/llvoavatar.cpp
  30. +3 −3 indra/newview/res/{viewerRes.rc → viewerRes.rc.in}
  31. +1 −0 indra/newview/skins/default/xui/en-us/floater_directory.xml
  32. +1 −1 indra/newview/skins/default/xui/en-us/panel_region_general.xml
  33. +7 −4 indra/newview/viewer_manifest.py
  34. +1 −1 scripts/install-deps.sh
View
2 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...)
@@ -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)
@@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES
Audio.cmake
BasicPluginBase.cmake
Boost.cmake
BuildBranding.cmake
BuildVersion.cmake
CARes.cmake
CEFPlugin.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.")
@@ -106,6 +106,7 @@ def get_default_platform(dummy):
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',
View
@@ -736,6 +736,15 @@ std::vector<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
<< ((constraint == CURRENT_SKIN)? "CURRENT_SKIN" : "ALL_SKINS")
<< LL_ENDL;
// Build results vector.
std::vector<std::string> 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<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
}
}
// Build results vector.
std::vector<std::string> results;
// The process we use depends on 'constraint'.
if (constraint != CURRENT_SKIN) // meaning ALL_SKINS
{
@@ -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}
@@ -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";
@@ -9,30 +9,30 @@
</array>
<key>blue_density</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</real>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>blue_horizon</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</real>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_color</key>
<array>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
@@ -51,26 +51,26 @@
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10</real>
<real>10</real>
<real>11.539999961853027</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0</real>
<real>0.00042999998549930751</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</real>
<real>8.1000003814697266</real>
<real>0</real>
<real>0</real>
<real>1</real>
@@ -84,52 +84,52 @@
</array>
<key>gamma</key>
<array>
<real>4</real>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>20</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0</real>
<real>0.079999998211860657</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0</real>
<real>0.19915600437467304</real>
<real>0.19915600437467304</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0</real>
<real>1</real>
<real>1.1483815569590661e-006</real>
<real>0.89100658893585205</real>
<real>0.45399042963981628</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>0</real>
<real>718.70001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>26</integer>
<integer>23</integer>
<key>star_brightness</key>
<real>2</real>
<real>0</real>
<key>sun_angle</key>
<real>1.5707951784133911</real>
<real>1.0995575189590454</real>
<key>sunlight_color</key>
<array>
<real>0</real>
Oops, something went wrong.

0 comments on commit 68c4981

Please sign in to comment.