diff --git a/LICENSES/openal-linden.txt b/LICENSES/openal-linden.txt deleted file mode 100644 index ea1595f5f..000000000 --- a/LICENSES/openal-linden.txt +++ /dev/null @@ -1,4 +0,0 @@ -This is a modified version of openal-soft from GIT (56cc03860378e2758370b773b2a6f1b4e086b49a). -The modified source which this was built from is available here: -http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/openal-soft-linden-56cc03860378e2758370b773b2a6f1b4e086b49a.tar.bz2 - diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index f8a113f65..5ba730c4a 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -1,10 +1,10 @@ # -*- cmake -*- include(Prebuilt) -if (NOT STANDALONE) +if (NOT (STANDALONE OR DARWIN)) use_prebuilt_binary(glext) # possible glh_linear should have its own .cmake file instead #use_prebuilt_binary(glh_linear) # actually... not any longer, it's now in git -SG set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) -endif (NOT STANDALONE) +endif () diff --git a/indra/develop.py b/indra/develop.py index 03d1b19bd..7e1d3f1ba 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -749,6 +749,7 @@ class CygwinSetup(WindowsSetup): setup_platform = { 'darwin': DarwinSetup, 'linux2': LinuxSetup, + 'linux3': LinuxSetup, 'win32' : WindowsSetup, 'cygwin' : CygwinSetup } diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index fb5fb7cad..103f3b247 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -1454,9 +1454,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option } case LLSD::TypeUUID: + { ostr.put('u'); - ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES); + LLUUID value = data.asUUID(); + ostr.write((const char*)(&value.mData), UUID_BYTES); break; + } case LLSD::TypeString: ostr.put('s'); @@ -2173,4 +2176,4 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size) free(result); return true; } -#endif //MESH_ENABLED \ No newline at end of file +#endif //MESH_ENABLED diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index ba2e3f542..ca23c9637 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 = 5; -const S32 LL_VERSION_PATCH = 10; -const S32 LL_VERSION_BUILD = 1; +const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_BUILD = 2; const char * const LL_CHANNEL = "Singularity"; diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp index a8da3051a..15e1d347a 100644 --- a/indra/llplugin/llplugininstance.cpp +++ b/indra/llplugin/llplugininstance.cpp @@ -90,7 +90,7 @@ int LLPluginInstance::load(std::string &plugin_file) #if LL_LINUX && defined(LL_STANDALONE) void *dso_handle = dlopen(plugin_file.c_str(), RTLD_NOW | RTLD_GLOBAL); int result = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&mDSOHandle, - dso_handle, AIAPRRootPool::get()()); + dso_handle, LLAPRRootPool::get()()); #else int result = apr_dso_load(&mDSOHandle, plugin_file.c_str(), diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 6ba2f323b..685485fc1 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -409,7 +409,7 @@ void LLPluginProcessParent::idle(void) cmd << gdb_path << " -n /proc/" << mProcess.getProcessID() << "/exe " << mProcess.getProcessID(); typedef boost::tokenizer< boost::escaped_list_separator< - char>, typename std::basic_string< + char>, std::basic_string< char>::const_iterator, std::basic_string > tokenizerT; @@ -418,7 +418,7 @@ void LLPluginProcessParent::idle(void) boost::escaped_list_separator< char >("\\", " ", "'\"")); std::vector< std::basic_string > tokens; - for (typename tokenizerT::iterator + for (tokenizerT::iterator cur_token(tok.begin()), end_token(tok.end()); cur_token != end_token; ++cur_token) { if (!cur_token->empty()) diff --git a/indra/llplugin/llpluginsharedmemory.cpp b/indra/llplugin/llpluginsharedmemory.cpp index 883d7b634..56a6fe1c9 100644 --- a/indra/llplugin/llpluginsharedmemory.cpp +++ b/indra/llplugin/llpluginsharedmemory.cpp @@ -277,6 +277,14 @@ LLPluginSharedMemoryPlatformImpl::~LLPluginSharedMemoryPlatformImpl() bool LLPluginSharedMemory::map(void) { + llassert(mSize); + if (!mSize) + { + LL_DEBUGS("Plugin") << "Tried to mmap zero length" << LL_ENDL; + return false; + } + llassert(mImpl->mSharedMemoryFD != -1); + llassert(fcntl(mImpl->mSharedMemoryFD, F_GETFL) != -1); mMappedAddress = ::mmap(NULL, mSize, PROT_READ | PROT_WRITE, MAP_SHARED, mImpl->mSharedMemoryFD, 0); if(mMappedAddress == NULL) { diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 48fea8e87..57c229a12 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -68,6 +68,7 @@ BOOL gGLActive = FALSE; std::ofstream gFailLog; +#if !LL_DARWIN //Darwin doesn't load extensions that way! -SG void* gl_get_proc_address(const char *pStr) { void* pPtr = (void*)GLH_EXT_GET_PROC_ADDRESS(pStr); @@ -77,6 +78,7 @@ void* gl_get_proc_address(const char *pStr) } #undef GLH_EXT_GET_PROC_ADDRESS #define GLH_EXT_GET_PROC_ADDRESS(p) gl_get_proc_address(p) +#endif //!LL_DARWIN void ll_init_fail_log(std::string filename) { diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3334fa9bb..6d480c2b4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -436,7 +436,7 @@ Type String Value - secondlife + Second Life VivoxLicenseAccepted diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index c489f2acd..8f22b1c5e 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -99,6 +99,14 @@ ATI Mobility Radeon HD 5500 .*ATI.*Mobility *HD *55.* 2 1 ATI Mobility Radeon HD 5600 .*ATI.*Mobility *HD *56.* 2 1 ATI Mobility Radeon HD 5700 .*ATI.*Mobility *HD *57.* 3 1 ATI Mobility Radeon HD 5800 .*ATI.*Mobility *HD *58.* 3 1 +ATI Mobility Radeon HD 6200 .*ATI.*Mobility.*HD *62.* 3 1 +ATI Mobility Radeon HD 6300 .*ATI.*Mobility.*HD *63.* 3 1 +ATI Mobility Radeon HD 6400M .*ATI.*Mobility.*HD *64.* 3 1 +ATI Mobility Radeon HD 6500M .*ATI.*Mobility.*HD *65.* 3 1 +ATI Mobility Radeon HD 6600M .*ATI.*Mobility.*HD *66.* 3 1 +ATI Mobility Radeon HD 6700M .*ATI.*Mobility.*HD *67.* 3 1 +ATI Mobility Radeon HD 6800M .*ATI.*Mobility.*HD *68.* 3 1 +ATI Mobility Radeon HD 6900M .*ATI.*Mobility.*HD *69.* 3 1 ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 0 1 ATI Mobility Radeon X2xxx .*ATI.*Mobility.*X2.* 0 1 ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 1 diff --git a/indra/newview/hippopanelgrids.cpp b/indra/newview/hippopanelgrids.cpp index f64a7466d..d3cc7a4e2 100644 --- a/indra/newview/hippopanelgrids.cpp +++ b/indra/newview/hippopanelgrids.cpp @@ -294,12 +294,11 @@ bool HippoPanelGridsImpl::saveCurGrid() { HippoGridInfo *gridInfo = 0; - if (mState == NORMAL) { - - gridInfo = gHippoGridManager->getGrid(mCurGrid); - gridInfo->retrieveGridInfo(); - refresh(); - } else if ((mState == ADD_NEW) || (mState == ADD_COPY)) { + gridInfo = gHippoGridManager->getGrid(mCurGrid); + gridInfo->retrieveGridInfo(); + refresh(); + + if ((mState == ADD_NEW) || (mState == ADD_COPY)) { // check nickname std::string gridname = childGetValue("gridname"); diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp index 52adf6c39..8953dec87 100644 --- a/indra/newview/hipporestrequest.cpp +++ b/indra/newview/hipporestrequest.cpp @@ -327,6 +327,7 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result) curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1); // don't use SIGALRM for timeouts curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5); // seconds + curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str()); curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, curlWrite); curl_easy_setopt(curlp, CURLOPT_WRITEDATA, result); diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index e1e35874a..aefc0b4ab 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -82,7 +82,7 @@ LLIconDictionary::LLIconDictionary() addEntry(LLInventoryIcon::ICONNAME_ANIMATION, new IconEntry("inv_item_animation.tga")); addEntry(LLInventoryIcon::ICONNAME_GESTURE, new IconEntry("inv_item_gesture.tga")); - addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, new IconEntry("inv_item_physics.png")); + addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, new IconEntry("inv_item_physics.tga")); addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("inv_link_item.tga")); addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("inv_link_folder.tga")); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4bf228c33..70ebcc36f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -808,7 +808,7 @@ void init_menus() menu->appendSeparator(); menu->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL)); menu->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL)); - menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL)); + menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL, NULL, 'P', MASK_CONTROL | MASK_ALT)); menu->appendSeparator(); menu->append(new LLMenuItemCallGL( "Animation Override...", &handle_edit_ao, NULL)); diff --git a/indra/newview/skins/default/textures/inv_item_physics.tga b/indra/newview/skins/default/textures/inv_item_physics.tga new file mode 100644 index 000000000..f1d0e5f19 Binary files /dev/null and b/indra/newview/skins/default/textures/inv_item_physics.tga differ diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml index a34e943bf..f5897c16d 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml @@ -31,7 +31,7 @@ width="400" /> + follows="left|top|right|bottom" label="Tags/Colors" name="TagsColors"> darwin md5sum - a9ab0e2910e1a8fe06a2a42ffdc8b7da + 2849e9dd6f26294371a27197972fd1cf url - https://github.com/siana-osx/SingularityViewer/downloads/freetype-2.4.4-darwin-20110705.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-darwin-20111010.tar.bz2 linux @@ -1109,9 +1109,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - c8223e9454223e3d519fe40d71c3ddd2 + 01cff9a641348bb15856b808a4e9ccc6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20091216-56cc0386.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/openal-linux-111022.tar.bz2 linux64 diff --git a/repackage.sh b/repackage.sh index 5de6ea4c7..c8f6b401c 100755 --- a/repackage.sh +++ b/repackage.sh @@ -15,6 +15,10 @@ LIBPATH="" INCPATH="" PWD=`pwd` +if [ -z "$1" ]; then + usage +fi + shopt -s nocasematch case "$1" in --windows|-w|windows|win) @@ -40,6 +44,7 @@ case "$1" in INCPATH="libraries/x86_64-linux/include" ;; *) + echo ERROR: No mode specified usage ;; esac @@ -51,14 +56,14 @@ case "$2" in ;; esac -test -n "$2" && FILEIN=`readlink -e $2` -test -n "$3" && FILEOUT=`readlink -f $3` - -if [ -z $FILEIN ]; then +FILEIN=$2 +if [ -z "$FILEIN" ]; then + echo ERROR: No input file specified usage fi -if [ -z $FILEOUT ]; then +test -n "$3" && FILEOUT=`readlink -f $3` +if [ -z "$FILEOUT" ]; then FILEOUT=`readlink -m package.tar.bz2` fi @@ -66,7 +71,7 @@ mkdir "$TMP" cd "$TMP" case "$FILEIN" in - http\:\/\/|https\:\/\/) + http\:\/\/*|https\:\/\/*) echo " Downloading..." wget "$FILEIN" -O package.tar.bz2 echo " Unpacking..." @@ -74,6 +79,11 @@ case "$FILEIN" in rm package.tar.bz2 ;; *) + FILEIN=`readlink -e $FILEIN` + if [ -z "$FILEIN" ]; then + echo ERROR: Input file not found + usage + fi echo " Unpacking..." tar -xjvf "$FILEIN" ;;