Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2018-02-08 01:35:31 -06:00
parent 24a05a2ebe 1271eeb808
commit 05b8e08ee8
40 changed files with 605 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -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...)

38
indra/cmake/BuildBranding.cmake Normal file
View File

@@ -0,0 +1,38 @@
# -*- cmake -*-
if (WINDOWS)
message(WARNING, ${CMAKE_CURRENT_BINARY_DIR}/newview/viewerRes.rc.in)
configure_file(
${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
)
endif (WINDOWS)
if (DARWIN)
configure_file(
${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
${CMAKE_CURRENT_BINARY_DIR}/English.lproj/InfoPlist.strings
)
endif (DARWIN)
if (LINUX)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
${CMAKE_CURRENT_BINARY_DIR}/linux_tools/wrapper.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
${CMAKE_CURRENT_BINARY_DIR}/linux_tools/handle_secondlifeprotocol.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
${CMAKE_CURRENT_BINARY_DIR}/linux_tools/install.sh
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
${CMAKE_CURRENT_BINARY_DIR}/linux_tools/refresh_desktop_app_entry.sh
@ONLY
)
endif (LINUX)

1
indra/cmake/CMakeLists.txt
View File

@@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES
Audio.cmake
BasicPluginBase.cmake
Boost.cmake
BuildBranding.cmake
BuildVersion.cmake
CARes.cmake
CEFPlugin.cmake

6
indra/cmake/Variables.cmake
View File

@@ -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.")

1
indra/lib/python/indra/util/llmanifest.py
View File

@@ -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',

2
indra/llcommon/CMakeLists.txt
View File

@@ -286,7 +286,9 @@ target_link_libraries(
${APRUTIL_LIBRARIES}
${APR_LIBRARIES}
${EXPAT_LIBRARIES}
${CRYPTO_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES}
${Boost_CONTEXT_LIBRARY}

1
indra/llmessage/CMakeLists.txt
View File

@@ -225,6 +225,7 @@ target_link_libraries(
llmessage
${CURL_LIBRARIES}
${CARES_LIBRARIES}
${CRYPTO_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${XMLRPCEPI_LIBRARIES}

11
indra/llvfs/lldir.cpp
View File

@@ -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
{

12
indra/newview/CMakeLists.txt
View File

@@ -6,6 +6,7 @@ include(00-Common)
include(Boost)
include(BuildPackagesInfo)
include(BuildVersion)
include(BuildBranding)
include(CMakeCopyIfDifferent)
include(DBusGlib)
include(FMODSTUDIO)
@@ -35,6 +36,7 @@ include(Linking)
include(NDOF)
include(NVAPI)
include(OPENAL)
include(OpenSSL)
include(StateMachine)
include(TemplateCheck)
include(UI)
@@ -1302,9 +1304,6 @@ if (WINDOWS)
set_source_files_properties(${viewer_RESOURCE_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/res/viewerRes.rc
${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
)
set(viewer_RESOURCE_FILES
${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
${viewer_RESOURCE_FILES}
@@ -1540,6 +1539,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}
@@ -1594,6 +1594,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}
@@ -1666,6 +1667,9 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${UI_LIBRARIES}
${WINDOWS_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
${CRYPTO_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${HUNSPELL_LIBRARY}
${LLPHYSICSEXTENSIONS_LIBRARIES}
${LLAPPEARANCE_LIBRARIES}
@@ -1691,6 +1695,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}
@@ -1714,6 +1719,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}

2
indra/newview/English.lproj/InfoPlist.strings.in
View File

@@ -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";

62
indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml
View File

@@ -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>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<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,21 +84,21 @@
</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>
@@ -106,30 +106,30 @@
<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>

141
indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml Normal file
View File

@@ -0,0 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>blue_density</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</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>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>4</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0</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>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0</real>
<real>1</real>
<real>1.1483815569590661e-006</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>26</integer>
<key>star_brightness</key>
<real>2</real>
<key>sun_angle</key>
<real>1.5707951784133911</real>
<key>sunlight_color</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
</map>
</llsd>

141
indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml Normal file
View File

@@ -0,0 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>3</real>
<real>3</real>
<real>2.9999997615814209</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999999369830818</real>
<real>0.44999999398335949</real>
<real>0.4499999944309046</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999567946317</real>
<real>0.23999999579784967</real>
<real>0.23999999583870221</real>
<real>1</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>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0</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>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0</real>
<real>1</real>
<real>1.1483815569590661e-006</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>26</integer>
<key>star_brightness</key>
<real>2</real>
<key>sun_angle</key>
<real>1.5707951784133911</real>
<key>sunlight_color</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
</map>
</llsd>

72
indra/newview/app_settings/windlight/skies/Ambient%20White.xml
View File

@@ -4,79 +4,79 @@
<array>
<real>3</real>
<real>3</real>
<real>2.9999997615814209</real>
<real>3</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999999369830818</real>
<real>0.44999999398335949</real>
<real>0.4499999944309046</real>
<real>1</real>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999567946317</real>
<real>0.23999999579784967</real>
<real>0.23999999583870221</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>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.99999999999999289</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0.4199999868869746</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10</real>
<real>10</real>
<real>10.069999694824219</real>
<real>11.050000190734863</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.00089999998454004526</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</real>
<real>0.80000001192093606</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<real>4.7123889923095703</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
@@ -93,12 +93,12 @@
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>-0.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0</real>
<real>0.029999999329447746</real>
<real>0</real>
<real>0</real>
<real>1</real>
@@ -106,30 +106,30 @@
<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.99144464731216431</real>
<real>0.13052797317504883</real>
<real>-1.182285913614578e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>0</real>
<real>4000</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>26</integer>
<integer>22</integer>
<key>star_brightness</key>
<real>2</real>
<real>0</real>
<key>sun_angle</key>
<real>1.5707951784133911</real>
<real>3.0106911659240723</real>
<key>sunlight_color</key>
<array>
<real>0</real>

8
indra/newview/installers/windows/lang_da.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_de.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_es.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_fr.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_it.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_pl.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_pt-br.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_ru.nsi
View File

@@ -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} "Проверка подключения к сети..."

8
indra/newview/installers/windows/lang_tr.nsi
View File

@@ -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..."

8
indra/newview/installers/windows/lang_zh.nsi
View File

@@ -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} "正在檢查網路連接..."

2
indra/newview/linux_tools/wrapper.sh → indra/newview/linux_tools/wrapper.sh.in
View File

@@ -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"'

2
indra/newview/llappviewer.cpp
View File

@@ -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() )

2
indra/newview/llfloaterabout.cpp
View File

@@ -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

9
indra/newview/llfloaterdirectory.cpp
View File

@@ -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<LLPanel>("find_all_panel"));
container->removeTabPanel(getChild<LLPanel>("find_all_old_panel"));
LLPanel* p = getChild<LLPanel>("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);

32
indra/newview/llfloaterreporter.cpp
View File

@@ -215,15 +215,12 @@ LLFloaterReporter::~LLFloaterReporter()
// virtual
void LLFloaterReporter::draw()
{
getChildView("screen_check")->setEnabled(TRUE );
LLFloater::draw();
}
void LLFloaterReporter::enableControls(BOOL enable)
{
getChildView("category_combo")->setEnabled(enable);
getChildView("screen_check")->setEnabled(enable);
getChildView("screenshot")->setEnabled(false);
getChildView("pick_btn")->setEnabled(enable);
getChildView("summary_edit")->setEnabled(enable);
@@ -391,19 +388,10 @@ void LLFloaterReporter::onClickSend(void *userdata)
}
else
{
if(self->getChild<LLUICtrl>("screen_check")->getValue())
{
self->getChildView("send_btn")->setEnabled(FALSE);
self->getChildView("cancel_btn")->setEnabled(FALSE);
// the callback from uploading the image calls sendReportViaLegacy()
self->uploadImage();
}
else
{
self->sendReportViaLegacy(self->gatherReport());
LLUploadDialog::modalUploadFinished();
self->close();
}
self->getChildView("send_btn")->setEnabled(FALSE);
self->getChildView("cancel_btn")->setEnabled(FALSE);
// the callback from uploading the image calls sendReportViaLegacy()
self->uploadImage();
}
}
}
@@ -648,20 +636,12 @@ LLSD LLFloaterReporter::gatherReport()
gGLManager.mGLRenderer.c_str(),
gGLManager.mDriverVersionVendorString.c_str());
// only send a screenshot ID if we're asked to and the email is
// going to LL - Estate Owners cannot see the screenshot asset
LLUUID screenshot_id = LLUUID::null;
if (getChild<LLUICtrl>("screen_check")->getValue())
{
screenshot_id = getChild<LLUICtrl>("screenshot")->getValue();
}
LLSD report = LLSD::emptyMap();
report["report-type"] = (U8) mReportType;
report["category"] = getChild<LLUICtrl>("category_combo")->getValue();
report["position"] = mPosition.getValue();
report["check-flags"] = (U8)0; // this is not used
report["screenshot-id"] = screenshot_id;
report["screenshot-id"] = getChild<LLUICtrl>("screenshot")->getValue();
report["object-id"] = mObjectID;
report["abuser-id"] = mAbuserID;
report["abuse-region-name"] = "";
@@ -745,7 +725,7 @@ private:
void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report)
{
if(getChild<LLUICtrl>("screen_check")->getValue().asBoolean() && !sshot_url.empty())
if(!sshot_url.empty())
{
// try to upload screenshot
LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report,

43
indra/newview/llfloaterscriptlimits.cpp
View File

@@ -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<LLUICtrl>("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<LLUICtrl>("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<LLUICtrl>("memory_used")->setValue(LLTrans::getString(translate_message, args_attachment_memory));
}
if((mAttachmentURLsUsed >= 0) && (mAttachmentURLsMax >= 0))

2
indra/newview/llstatusbar.cpp
View File

@@ -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

20
indra/newview/llvoavatar.cpp
View File

@@ -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;
}
}

6
indra/newview/res/viewerRes.rc → indra/newview/res/viewerRes.rc.in
View File

@@ -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

1
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -72,6 +72,7 @@
<string name="not_found_text">
None Found.
</string>
<string name="classic_label" value="Classic"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"

165
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -9,7 +9,7 @@
follows="left|top" height="114" label="" left="238" mouse_opaque="true"
name="screenshot" width="134" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Include screenshot" left="13"
initial_value="true" visible="false" label="Include screenshot" left="13"
mouse_opaque="true" name="screen_check" width="116" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-48" drop_shadow_visible="true" follows="left|top"
@@ -85,93 +85,82 @@
name="category_combo"
tool_tip="Category -- select the category that best describes this report"
width="356">
<combo_item name="Select_category" value="0">
Select category
</combo_item><combo_item name="Age__Age_play" value="31">
Age > Age play
</combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
Age > Adult resident on Teen Second Life
</combo_item><combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33">
Age > Underage resident outside of Teen Second Life
</combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
Assault > Combat sandbox / unsafe area
</combo_item><combo_item name="Assault__Safe_area" value="35">
Assault > Safe area
</combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
Assault > Weapons testing sandbox
</combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
Commerce > Failure to deliver product or service
</combo_item><combo_item name="Disclosure__Real_world_information" value="39">
Disclosure > Real world information
</combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
Disclosure > Remotely monitoring chat
</combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
Disclosure > Second Life information/chat/IMs
</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
Disturbing the peace > Unfair use of region resources
</combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
Disturbing the peace > Excessive scripted objects
</combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
Disturbing the peace > Object littering
</combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
Disturbing the peace > Repetitive spam
</combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
Disturbing the peace > Unwanted advert spam
</combo_item><combo_item name="Fraud__L$" value="47">
Fraud > L$
</combo_item><combo_item name="Fraud__Land" value="48">
Fraud > Land
</combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
Fraud > Pyramid scheme or chain letter
</combo_item><combo_item name="Fraud__US$" value="50">
Fraud > US$
</combo_item><combo_item name="Ridiculous3" value="100">
Freud > User has taken an interest in their mother
</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
Harassment > Advert farms / visual spam
</combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
Harassment > Defaming individuals or groups
</combo_item><combo_item name="Harassment__Impeding_movement" value="53">
Harassment > Impeding movement
</combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
Harassment > Sexual harassment
</combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
Harassment > Solicting/inciting others to violate ToS
</combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
Harassment > Verbal abuse
</combo_item><combo_item name="Ridiculous1" value="100">
Harassment > User keeps licking finger and touching me
</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
Indecency > Broadly offensive content or conduct
<!-- 58 = deprecated by AO -->
</combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
Indecency > Inappropriate avatar name
</combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
Indecency > Inappropriate content or conduct in a PG region
</combo_item><combo_item name="Indecency__Inappropriate_content_in_Mature_region" value="69">
Indecency > Inappropriate content or conduct in a Mature region
</combo_item><combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
Intellectual property infringement > Content Removal
</combo_item><combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
Intellectual property infringement > CopyBot or Permissions Exploit
</combo_item><combo_item name="Intolerance" value="61">
Intolerance
</combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
Land > Abuse of sandbox resources
</combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
Land > Encroachment > Objects/textures
</combo_item><combo_item name="Land__Encroachment__Particles" value="64">
Land > Encroachment > Particles
</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
Land > Encroachment > Trees/plants
</combo_item><combo_item name="Ridiculous2" value="100">
Land > Encroachment > User won't stay on their side of the car
</combo_item><combo_item name="Wagering_gambling" value="67">
Wagering/gambling
</combo_item>
<combo_item name="Other" value="68">
Other
</combo_item>
<combo_box.item
label="Select category"
name="Select_category"
value="0" />
<combo_box.item
label="Age &gt; Age play"
name="Age__Age_play"
value="31" />
<combo_box.item
label="Assault &gt; Shooting, pushing, or shoving another Resident in a Safe Area"
name="Assault__Safe_area"
value="35" />
<combo_box.item
label="Disclosure &gt; Real world information"
name="Disclosure__Real_world_information"
value="39" />
<combo_box.item
label="Disturbing the peace &gt; Excessive scripted objects"
name="Disturbing_the_peace__Excessive_scripted_objects"
value="43" />
<combo_box.item
label="Disturbing the peace &gt; Object littering"
name="Disturbing_the_peace__Object_littering"
value="44" />
<combo_box.item
label="Disturbing the peace &gt; Repetitive spam"
name="Disturbing_the_peace__Repetitive_spam"
value="45" />
<combo_box.item
label="Fraud &gt; L$ or USD $"
name="Fraud__US$"
value="50" />
<combo_box.item
name="Ridiculous3"
label="Freud &gt; User has taken an interest in their mother"
value="100" />
<combo_box.item
label="Harassment &gt; Targeted behavior intended to disrupt"
name="Harassment__Solicting_inciting_others_to_violate_ToS"
value="55" />
<combo_box.item
label="Harassment &gt; User keeps licking finger and touching me"
name="Ridiculous1"
value="100"/>
<combo_box.item
label="Indecency &gt; Broadly offensive content or conduct"
name="Indecency__Broadly_offensive_content_or_conduct"
value="57" />
<combo_box.item
label="Indecency &gt; Inappropriate avatar name"
name="Indecency__Inappropriate_avatar_name"
value="59" />
<combo_box.item
label="Indecency &gt; Inappropriate content or conduct for Region Rating"
name="Indecency__Mature_content_in_PG_region"
value="60" />
<combo_box.item
label="Intolerance"
name="Intolerance"
value="61" />
<combo_box.item
label="Land &gt; Encroachment &gt; Objects or textures"
name="Land__Encroachment__Objects_textures"
value="63" />
<combo_box.item
name="Ridiculous2"
label="Land &gt; Encroachment &gt; User won't stay on their side of the car"
value="100" />
<combo_box.item
label="Gaming Policy Violation"
name="Wagering_gambling"
value="67" />
<combo_box.item
label="Other"
name="Other"
value="68" />
</combo_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" follows="left|top"

2
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -58,7 +58,7 @@
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="parcel_search_help" width="18" />
<spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
label="Agent Limit" label_width="97" left="10" max_val="110" min_val="1"
name="agent_limit_spin" width="170" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="agent_limit_help" width="18" />

11
indra/newview/viewer_manifest.py
View File

@@ -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")

BIN
indra/tools/vstool/VSTool.exe
View File

Binary file not shown.

4
indra/tools/vstool/main.cs
View File

@@ -33,8 +33,8 @@ namespace VSTool
int IOleMessageFilter.RetryRejectedCall(IntPtr
hTaskCallee, int dwTickCount, int dwRejectType)
{
if (dwRejectType == 2)
// flag = SERVERCALL_RETRYLATER.
if (dwRejectType == 1 || dwRejectType == 2)
// flag = SERVERCALL_RETRYLATER or SERVERCALL_REJECTED.
{
// Retry the thread call immediately if return >=0 &
// <100.

2
scripts/install-deps.sh
View File

@@ -15,7 +15,7 @@ if [ -f /etc/arch-release ]; then
else
pacman -S --asdeps ${DEPS}
fi
elif [ -f /etc/lsb-release ]; then
elif [ -f /etc/lsb-release ] || [ -f /etc/debian_version ]; then
$echo -e "\e[1;31mDebian/Ubuntu Linux detected!\e[0m"
DEPS="libapr1-dev libaprutil1-dev build-essential libboost-dev libc-ares-dev cmake libcurl4-openssl-dev libdb-dev libdbus-glib-1-dev libexpat1-dev fontconfig libalut-dev libfreetype6-dev libgoogle-perftools-dev libglib2.0-dev libgstreamer-plugins-base0.10-dev libgtk2.0-dev libhunspell-dev libjpeg-turbo8-dev libogg-dev libpng12-dev libvorbis-dev libopenal-dev libssl-dev libpcre3-dev libqtwebkit-dev libsdl1.2-dev"
for dep in $DEPS; do