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

Worked through rejects from sg1.5 merge. Went in smoothly O.o

Browse Source
This commit is contained in:
Siana Gearz
2010-10-18 13:45:04 +02:00
parent babc0dc420
commit 3d60deaf31
8 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/CMakeLists.txt
View File

@@ -1512,7 +1512,7 @@ if (INSTALL)
endif (INSTALL)
# Add tests
if (NOT STANDALONE)
if (LL_TESTS)
ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
#ADD_VIEWER_BUILD_TEST(llworldmap viewer)
#ADD_VIEWER_BUILD_TEST(llworldmipmap viewer)
@@ -1520,7 +1520,7 @@ if (NOT STANDALONE)
ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer)
ADD_VIEWER_BUILD_TEST(lltexturestatsuploader viewer)
#ADD_VIEWER_COMM_BUILD_TEST(lltranslate viewer "")
endif (NOT STANDALONE)
endif (LL_TESTS)
# Don't do these for DARWIN or LINUX here -- they're taken care of by viewer_manifest.py
if (WINDOWS)

4
indra/newview/English.lproj/InfoPlist.strings
View File

@@ -2,6 +2,6 @@
CFBundleName = "Ascent";
CFBundleShortVersionString = "Ascent version 1.4.2.7";
CFBundleGetInfoString = "Snowglobe version 1.4.2.7, Balseraph Software Group";
CFBundleShortVersionString = "Ascent version 1.5.0.0";
CFBundleGetInfoString = "Snowglobe version 1.5.0.0, Balseraph Software Group";

12
indra/newview/linux_tools/wrapper.sh
View File

@@ -45,14 +45,6 @@ export LL_BAD_FMOD_DRIVER=x
## disable these by enabling this option:
#export LL_DISABLE_GSTREAMER=x
## - GStreamer is automatically disabled - for now - on 64-bit systems due
## to common fatal incompatibilities; remove/comment these lines if you want
## to try anyway.
if [ "`uname -m`" = "x86_64" ]; then
# export LL_DISABLE_GSTREAMER=x
echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./snowglobe to re-enable.'
fi
## Everything below this line is just for advanced troubleshooters.
##-------------------------------------------------------------------
@@ -135,7 +127,9 @@ if [ -n "$LL_RUN_ERR" ]; then
if [ "$LL_RUN_ERR" = "runerr" ]; then
# generic error running the binary
echo '*** Bad shutdown. ***'
if [ "`uname -m`" = "x86_64" ]; then
BINARY_TYPE=$(expr match "$(file -b ${RUN_PATH}/bin/SLPlugin)" '\(.*executable\)')
BINARY_SYSTEM=$(expr match "$(file -b /bin/uname)" '\(.*executable\)')
if [ "${BINARY_SYSTEM}" == "ELF 64-bit LSB executable" -a "${BINARY_TYPE}" == "ELF 32-bit LSB executable" ]; then
echo
cat << EOFMARKER
You are running the Second Life Viewer on a x86_64 platform. The

8
indra/newview/res/viewerRes.rc
View File

@@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,0,0
PRODUCTVERSION 1,4,0,0
FILEVERSION 1,5,0,0
PRODUCTVERSION 1,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Ascent"
VALUE "FileVersion", "1.4.0.0"
VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc."
VALUE "OriginalFilename", "Ascent.exe"
VALUE "ProductName", "Ascent"
VALUE "ProductVersion", "1.4.0.0"
VALUE "ProductVersion", "1.5.0.0"
END
END
BLOCK "VarFileInfo"