summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-04-22MergeXiaohong Bao
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21Pull and merge DRTVWR-364simon
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-15Linux/Win: Bad checksum on Windows package. Libz and libpng linking ↵Monty Brandenberg
changes to find newest code. Windows autobuild package had a bad checksum due to oddities in the build system. On Linux I've been fighting with getting libz 1.2.8 and libpng 1.6.8 to be the definitive version in the viewer. Problem is the *massive* library search tree we assemble. We find older shared library versions first and so those dominated. By using --whole-archive with static libraries, the packaged versions of these libraries are made definitive.
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-11Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.Monty Brandenberg
Part of the switchover to dynamic Qt4. This mostly completes the Mac side. Webkit is functional on Mac, plugins work. The two test programs, llfbconnectest and llplugintest, need a little more work to run without manual fixup ('.' on PATH and maybe a symlink to libz.1.dylib and they run and function on Mac). Also need to address libz.dylib vs libz.a. Currently resolving against dylib which is not what I want.
2014-04-09All/Linux: Update llqtwebkit to latest all-shared lib build. Linux packageMonty Brandenberg
assembly updated to deal with Qt libraries and discrete codec and imageformat plugins (which live under bin/llplugin). Functioning Linux viewer with MoaP support with a few image problems (sRGB profile, zlib errors). Much of this expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
2014-04-08added SKIP_AUTORUN command line flag to disable automatically running viewer ↵Richard Linden
after install
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-04-07MAINT-3915 FIX Recent Inventory Tab not showing Recent activityRichard Linden
old logic would interpret "don't care whether or not I am showing wearables" as "filter for just wearables, of any type"
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-04-07Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest forMonty Brandenberg
openssl on Mac (copy, deploy). Revert Linux manifest work which tried to work around 0555 permissions on .sos (and didn't work).
2014-04-04Linux: Building some .so's with 0555 permissions now but viewer wants toMonty Brandenberg
strip those down for packaging. So we'll target those .so's for a chmod.
2014-04-04Library updates and switch to 3d-llqtwebkit2 build products.Monty Brandenberg
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0 with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8, openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2 repository. Windows is functional with a good number of warning messages at runtime from libpng and KDU. MoaP/slplugin functioning.
2014-04-03MAINT-3870 FIXED The freelook animation never ends so the avatar never gets ↵andreylproductengine
to the idle status...
2014-03-31mergeBrad Payne (Vir Linden)
2014-03-31MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. ↵Mnikolenko ProductEngine
Confirmation dialog for teleporting via slapp is added.
2014-04-01BUG-5537 FIX reverting breaking changes to pectorals and belly.Nyx Linden
Fitted mesh introduced a couple of changes to the avatar_lad.xml file that cause the avatar definition to change in ways that are not backwards- compatible. Reverted the change in the range of pectoral size for male avatars, and the change in the position of the belly morph position (the later being a copy/paste error).
2014-03-26Pull in viewer-release and become version 3.7.5simon
2014-03-26Double init of logging probably due to merge fail.Aura Linden
2014-03-26Not ideal but sufficient.Aura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-24The simple approach has not worked. This hybrid solution should avoid the ↵Aura Linden
Windows issues and get us per-run logfiles.
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24merge with releaseRichard Linden
2014-03-24MAINT-3211 Fix for texture animations not working properly on rigged ↵Dave Parks
attachments when worn from inventory.
2014-04-16Backed out changeset: d0dfe3cda5b1Dave Parks
2014-04-09MAINT-3903 FIXED Instant message toasts and certain kinds of popups (ex. ↵maksymsproductengine
group invites) fail to display if an offline inventory offer was received before logging in: Backed out changeset: f7234f8fdce8: MAINT-3536 new crash in XML_ParserFree.
2014-03-24Merged in viewer-release.Aura Linden
2014-03-24increment viewer version to 3.7.5Oz Linden
2014-03-24merge changes for DRTVWR-360Oz Linden
2014-03-24Pulled merge from release.Aura Linden
2014-03-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread ↵Aura Linden
complexities.
2014-03-20MAINT-3827 FIXED crash in KDU texture decoding, likely out of memorymaksymsproductengine
2014-03-17ACME-1376 : Suppress location checkbox in Facebook Photo panelMerov Linden
2014-03-17ACME-1376 : Take the location checkbox out of the photo panelMerov Linden
2014-03-15Mac Debug build is functional with this manifest changeMonty Brandenberg
2014-03-15Made location checkbox automatically unchecked when caption is empty for ↵Cho
ACME-1375
2014-03-14Fix linux buildmaksymsproductengine
2014-03-14Made location checkbox disabled when caption is empty for ACME-1375Cho
2014-03-14MAINT-3804 FIXED Crash in LLAudioEngine::getAudioData when playing gestures ↵maksymsproductengine
with audio device disabled.
2014-03-13Merged in viewer-releaseAura Linden