From 3d60deaf31e03cc7c069f524ab46d14bca483b39 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 18 Oct 2010 13:45:04 +0200 Subject: [PATCH] Worked through rejects from sg1.5 merge. Went in smoothly O.o --- doc/contributions.txt | 22 +++++++++++++++++++ indra/llcommon/llversionviewer.h | 6 ++--- indra/llimage/CMakeLists.txt | 5 +++-- indra/llmessage/CMakeLists.txt | 5 +++-- indra/newview/CMakeLists.txt | 4 ++-- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- indra/newview/linux_tools/wrapper.sh | 12 +++------- indra/newview/res/viewerRes.rc | 8 +++---- 8 files changed, 42 insertions(+), 24 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index e3a876ff8..28eb4a1df 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -74,6 +74,16 @@ Aleric Inglewood SNOW-203 SNOW-408 SNOW-415 + SNOW-479 + SNOW-626 + SNOW-713 + SNOW-744 + SNOW-751 + SNOW-752 + SNOW-753 + SNOW-772 + SNOW-793 + SNOW-806 Alissa Sabre VWR-81 VWR-83 @@ -566,6 +576,7 @@ Robin Cornelius SNOW-484 SNOW-485 SNOW-488 + SNOW-802 VWR-2488 VWR-9557 VWR-11128 @@ -663,7 +674,9 @@ Techwolf Lupindo SNOW-237 SNOW-333 SNOW-334 + SNOW-497 VWR-12385 + VWR-20340 tenebrous pau VWR-247 Tharax Ferraris @@ -694,6 +707,12 @@ Thickbrick Sleaford SNOW-462 SNOW-513 SNOW-551 + SNOW-586 + SNOW-592 + SNOW-636 + SNOW-698 + SNOW-712 + SNOW-799 Thraxis Epsilon SVC-371 VWR-383 @@ -746,6 +765,9 @@ Whoops Babii VWR-8298 Wilton Lundquist VWR-7682 +Wolfpup Lowenhar + SNOW-622 + SNOW-772 Zarkonnen Decosta VWR-253 Zi Ree diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c43395731..8eb24fda9 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -34,9 +34,9 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 4; -const S32 LL_VERSION_PATCH = 2; -const S32 LL_VERSION_BUILD = 8; +const S32 LL_VERSION_MINOR = 5; +const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Ascent Viewer Release"; diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index df4612c1a..ddd9400eb 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -63,6 +63,7 @@ target_link_libraries( ) # Add tests -if (NOT STANDALONE) +if (LL_TESTS) ADD_BUILD_TEST(llimageworker llimage) -endif (NOT STANDALONE) +endif (LL_TESTS) + diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index b4dc33db0..65aec5ed7 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -217,12 +217,13 @@ target_link_libraries( ${XMLRPCEPI_LIBRARIES} ) -IF (NOT LINUX AND VIEWER) +IF (LL_TESTS) # When building the viewer the tests links against the shared objects. # These can not be found when we try to run the tests, so we had to disable them, for the viewer build. # TODO: Can someone with viewer knowledge figure out how to make these find the correct so. #ADD_BUILD_TEST(llhttpclientadapter llmessage) + ADD_BUILD_TEST(llhttpclientadapter llmessage) ADD_BUILD_TEST(lltrustedmessageservice llmessage) ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage) -ENDIF (NOT LINUX AND VIEWER) +ENDIF (LL_TESTS) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2450d2a35..654dad9c2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -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) diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index b2c2b72e6..20e804244 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -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"; diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index d87d2ed5a..b7654e22f 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -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 diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 2ac6e76c5..58e7c4b89 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -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 © 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"