diff --git a/CONTRIBUTORS b/CONTRIBUTORS deleted file mode 100644 index 92db36828..000000000 --- a/CONTRIBUTORS +++ /dev/null @@ -1,4 +0,0 @@ -Hazim Gazov -Apelsin -phr0z3nt04st -SimmanFederal diff --git a/LICENSE-libraries-linux.txt b/LICENSES/LICENSE-libraries-linux.txt similarity index 100% rename from LICENSE-libraries-linux.txt rename to LICENSES/LICENSE-libraries-linux.txt diff --git a/LICENSE-logos.txt b/LICENSES/LICENSE-logos.txt similarity index 100% rename from LICENSE-logos.txt rename to LICENSES/LICENSE-logos.txt diff --git a/LICENSE-source.txt b/LICENSES/LICENSE-source.txt similarity index 100% rename from LICENSE-source.txt rename to LICENSES/LICENSE-source.txt diff --git a/README.md b/README.md deleted file mode 100644 index 6e37244a4..000000000 --- a/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Forked from Inertia, Ascent's goal is to "clean up" the code, removing "bad" features and limiting as necessary to provide a stable, powerful client with features for both content creators and general use that adheres to the Linden Labs Third Party Viewer Policy. - -Since the initial fork to take in Inertia's useful asset browsing features, alpha skins on a Snowglobe base and other numerous attractive features, the code has been extensively modified to make sure that it is a legit Second Life client. Code from other Third Party Viewers has been merged extensively as well -- Including Emerald, Imprudence, and Nano. - -Far from being just a fork, we aim to aggregate useful features from all clients where content development is concerned, to provide builders, modders, programmers and all other creators in Second Life a powerful toolset to work their trade, without having to compromise their privacy or security by using TPVs such as Emerald. - -If you don't trust us or the legitimacy of our code, please, take it upon yourself to download our source and take a look. We have nothing to hide, and we will never obfusticate our code with encryption or closed-source DLL bundling. \ No newline at end of file diff --git a/cleanup-patch-crap.sh b/cleanup-patch-crap.sh deleted file mode 100755 index c9769fb69..000000000 --- a/cleanup-patch-crap.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -#clean up files left over from a patching session -#only run right before you commit! - -find . -name "*.orig" | xargs rm -find . -name "*.rej" | xargs rm diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 21f263faf..5cf1f472c 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -73,11 +73,33 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - # set this dynamically from the build system now - - # NOTE: wont have a distributable build unless you add this on the configure line with: + + # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure + # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly, + # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check + # for it being unset, as it gets set to the system default :( + + # Default to building against the 10.5 SDK if no deployment target is + # specified. + if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) + # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html + # see http://public.kitware.com/Bug/view.php?id=9959 + poppy + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) + + # GCC 4.2 is incompatible with the MacOSX 10.5 SDK + if (${CMAKE_OSX_SYSROOT} MATCHES "10.5") + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") + endif (${CMAKE_OSX_SYSROOT} MATCHES "10.5") + + # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' - #set(CMAKE_OSX_ARCHITECTURES i386;ppc) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + # Build only for i386 by default, system default on MacOSX 10.6 is x86_64 + if (NOT CMAKE_OSX_ARCHITECTURES) + set(CMAKE_OSX_ARCHITECTURES i386) + endif (NOT CMAKE_OSX_ARCHITECTURES) + if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(ARCH universal) else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") @@ -87,11 +109,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(ARCH i386) endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") + set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH_DIR universal-darwin) set(WORD_SIZE 32) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # Default deploy grid set(GRID agni CACHE STRING "Target Grid") @@ -101,13 +125,8 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for set(VIEWER_BRANDING_ID "Ascent" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)") # *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc -if (${VIEWER_BRANDING_ID} MATCHES "secondlife") - set(VIEWER_BRANDING_NAME "Second Life") - set(VIEWER_BRANDING_NAME_CAMELCASE "SecondLife") -elseif (${VIEWER_BRANDING_ID} MATCHES "Ascent") - set(VIEWER_BRANDING_NAME "Ascent") - set(VIEWER_BRANDING_NAME_CAMELCASE "Ascent") -endif (${VIEWER_BRANDING_ID} MATCHES "secondlife") + set(VIEWER_BRANDING_NAME "Ascent") + set(VIEWER_BRANDING_NAME_CAMELCASE "Ascent") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 092bc6a7e..342136a83 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -122,7 +122,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("Ascent"); + CFStringRef secondLifeString = CFSTR("SecondLife"); mainBundleRef = CFBundleGetMainBundle(); diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 94a82cfd9..462d6e989 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1428,14 +1428,14 @@ if (DARWIN) ${VIEWER_BINARY_NAME} PROPERTIES OUTPUT_NAME "${product}" - MACOSX_BUNDLE_INFO_STRING "info string - localize me" + MACOSX_BUNDLE_INFO_STRING "A stable third-party Second Life viewer." MACOSX_BUNDLE_ICON_FILE "${VIEWER_BRANDING_ID}.icns" MACOSX_BUNDLE_GUI_IDENTIFIER "${VIEWER_BRANDING_NAME}" - MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" + MACOSX_BUNDLE_LONG_VERSION_STRING "${viewer_VERSION}" MACOSX_BUNDLE_BUNDLE_NAME "${VIEWER_BRANDING_NAME}" - MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf" - MACOSX_BUNDLE_BUNDLE_VERSION "asdf" - MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer" + MACOSX_BUNDLE_SHORT_VERSION_STRING "${viewer_VERSION}" + MACOSX_BUNDLE_BUNDLE_VERSION "${viewer_VERSION}" + MACOSX_BUNDLE_COPYRIGHT "Copyright 2010 Balseraph Software Group" ) add_custom_command( diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 0a78196fd..b2c2b72e6 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -1,7 +1,7 @@ /* Localized versions of Info.plist keys */ -CFBundleName = "Snowglobe"; +CFBundleName = "Ascent"; -CFBundleShortVersionString = "Snowglobe version 1.3.0.0"; -CFBundleGetInfoString = "Snowglobe version 1.3.0.0, Copyright 2004-2009 Linden Research, Inc."; +CFBundleShortVersionString = "Ascent version 1.4.2.7"; +CFBundleGetInfoString = "Snowglobe version 1.4.2.7, Balseraph Software Group"; diff --git a/indra/newview/Info-Inertia.plist b/indra/newview/Info-Ascent.plist similarity index 87% rename from indra/newview/Info-Inertia.plist rename to indra/newview/Info-Ascent.plist index 78ea01e01..26c42f9ae 100644 --- a/indra/newview/Info-Inertia.plist +++ b/indra/newview/Info-Ascent.plist @@ -5,15 +5,15 @@ CFBundleDevelopmentRegion English CFBundleExecutable - Inertia + Ascent CFBundleIconFile - inertia.icns + Ascent.icns CFBundleIdentifier - com.inertia.indra.viewer + com.ascent.indra.viewer CFBundleInfoDictionaryVersion 6.0 CFBundleName - Inertia + Ascent CFBundlePackageType APPL CFBundleSignature diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist deleted file mode 100644 index 0b2c7224d..000000000 --- a/indra/newview/Info-SecondLife.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Second Life - CFBundleIconFile - secondlife.icns - CFBundleIdentifier - com.secondlife.indra.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Second Life - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 1.4.0.0 - CSResourcesFileMapped - - - diff --git a/indra/newview/Info-SecondLifeVorbis.plist b/indra/newview/Info-SecondLifeVorbis.plist deleted file mode 100644 index 9cb367eec..000000000 --- a/indra/newview/Info-SecondLifeVorbis.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - SecondLifeVorbis - CFBundleGetInfoString - - CFBundleIconFile - - CFBundleIdentifier - com.secondlife.indra.vorbis - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SecondLifeVorbis - CFBundlePackageType - FMWK - CFBundleShortVersionString - - CFBundleSignature - ???? - CFBundleVersion - 0.0.1d1 - - diff --git a/indra/newview/Info-Snowglobe.plist b/indra/newview/Info-Snowglobe.plist deleted file mode 100644 index 47329fae7..000000000 --- a/indra/newview/Info-Snowglobe.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Snowglobe - CFBundleIconFile - snowglobe.icns - CFBundleIdentifier - com.secondlife.snowglobe.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Snowglobe - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 1.4.0.0 - CSResourcesFileMapped - - - diff --git a/install.xml b/install.xml index d00bec507..e10f5b233 100644 --- a/install.xml +++ b/install.xml @@ -1071,16 +1071,16 @@ anguage Infrstructure (CLI) international standard darwin md5sum - a6843398b780645c4897c9776c688926 + 9915f6bf3f81d88c3f9c3d21790c5b4f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20080812.tar.bz2 + http://ascent.spiraling.org/download-libs/ogg-vorbis-1.2.0-1.3.1-darwin-20100920.tar.bz2 linux md5sum - 6dc0536329a0aadf76e3054ffd4da61c + b72b032c3e1550516595efb38621d2f1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20081201.tar.bz2 + http://ascent.spiraling.org/download-libs/ogg-vorbis-1.3.1-linux-20100907.tar.bz2 linux64 @@ -1092,9 +1092,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - 9bf1fea65e66b2cd3075e6ffd7eb57ad + 67ee18297c580940ea3c0ae23d4dec65 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20080723.tar.bz2 + http://ascent.spiraling.org/download-libs/ogg-vorbis-1.2.0-1.3.1-windows-20100907.tar.bz2