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

Git is hard. Let's go shopping. (Branding changes, minor cleanup, cache isolated, new Vorbis libs in install.xml)

Browse Source
This commit is contained in:
November
2010-09-26 22:54:00 -07:00
parent 3fa7780d51
commit fdebf7f06a
15 changed files with 49 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@@ -1,4 +0,0 @@
Hazim Gazov <hazim.gazov at the gmail dot coms>
Apelsin <No email provided>
phr0z3nt04st <phr0z3nt04st at the gmail dot coms>
SimmanFederal <SimmanFederal at the live dot coms>

0
LICENSE-libraries-linux.txt → LICENSES/LICENSE-libraries-linux.txt
View File

0
LICENSE-logos.txt → LICENSES/LICENSE-logos.txt
View File

0
LICENSE-source.txt → LICENSES/LICENSE-source.txt
View File

7
README.md
View File

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

6
cleanup-patch-crap.sh
View File

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

41
indra/cmake/Variables.cmake
View File

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

2
indra/llvfs/lldir_mac.cpp
View File

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

10
indra/newview/CMakeLists.txt
View File

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

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

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

8
indra/newview/Info-Inertia.plist → indra/newview/Info-Ascent.plist
View File

@@ -5,15 +5,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Inertia</string>
<string>Ascent</string>
<key>CFBundleIconFile</key>
<string>inertia.icns</string>
<string>Ascent.icns</string>
<key>CFBundleIdentifier</key>
<string>com.inertia.indra.viewer</string>
<string>com.ascent.indra.viewer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Inertia</string>
<string>Ascent</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>

39
indra/newview/Info-SecondLife.plist
View File

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Second Life</string>
<key>CFBundleIconFile</key>
<string>secondlife.icns</string>
<key>CFBundleIdentifier</key>
<string>com.secondlife.indra.viewer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Second Life</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>Second Life URL</string>
<key>CFBundleURLSchemes</key>
<array>
<string>secondlife</string>
</array>
<key>LSIsAppleDefaultForScheme</key>
<true/>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.0.0</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>

28
indra/newview/Info-SecondLifeVorbis.plist
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>SecondLifeVorbis</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.secondlife.indra.vorbis</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>SecondLifeVorbis</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.0.1d1</string>
</dict>
</plist>

39
indra/newview/Info-Snowglobe.plist
View File

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Snowglobe</string>
<key>CFBundleIconFile</key>
<string>snowglobe.icns</string>
<key>CFBundleIdentifier</key>
<string>com.secondlife.snowglobe.viewer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Snowglobe</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>Second Life URL</string>
<key>CFBundleURLSchemes</key>
<array>
<string>secondlife</string>
</array>
<key>LSIsAppleDefaultForScheme</key>
<true/>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.0.0</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>

12
install.xml
View File

@@ -1071,16 +1071,16 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>a6843398b780645c4897c9776c688926</string>
<string>9915f6bf3f81d88c3f9c3d21790c5b4f</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20080812.tar.bz2</uri>
<uri>http://ascent.spiraling.org/download-libs/ogg-vorbis-1.2.0-1.3.1-darwin-20100920.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>6dc0536329a0aadf76e3054ffd4da61c</string>
<string>b72b032c3e1550516595efb38621d2f1</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20081201.tar.bz2</uri>
<uri>http://ascent.spiraling.org/download-libs/ogg-vorbis-1.3.1-linux-20100907.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
@@ -1092,9 +1092,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key>
<map>
<key>md5sum</key>
<string>9bf1fea65e66b2cd3075e6ffd7eb57ad</string>
<string>67ee18297c580940ea3c0ae23d4dec65</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20080723.tar.bz2</uri>
<uri>http://ascent.spiraling.org/download-libs/ogg-vorbis-1.2.0-1.3.1-windows-20100907.tar.bz2</uri>
</map>
</map>
</map>