summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-08merge latest changes from ImaOz Linden
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07fix for build errors...removed duplicate definition of getpid on windowsRichard Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Pulled viewer-vivox4.6 into this branch for future RC.Aura Linden
2014-04-07Merged viewer release into vivoxAura Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Merge downstream codesimon
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-04-07MergeRichard Linden
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-07All: Update curl and llqtwebkit2 packages to new template builds.Monty Brandenberg
2014-04-07Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-04-07Added tag 3.7.5-release for changeset fc066b82343fOz 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-04Linux: Finish new Boost dependencies to get Linux building again.Monty Brandenberg
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-03Merge. Refresh from viewer-release after 3.7.4 release.Monty Brandenberg
2014-04-03MAINT-3870 FIXED The freelook animation never ends so the avatar never gets ↵andreylproductengine
to the idle status...
2014-04-04MAINT-3913 FIXED User is not able to upload any type of image(*.png, ↵Mnikolenko ProductEngine
*.tga,*.bmp,*.jpg)
2014-04-03MAINT-3870 FIXED The freelook animation never ends so the avatar never gets ↵andreylproductengine
to the idle status...
2014-04-01Merge downstream codesimon
2014-03-31mergeBrad Payne (Vir Linden)
2014-03-31MAINT-1696 FIXED "Owner" name is not clickable in "Place Profile" dialog if ↵andreykproductengine
region is group owned
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-04-01OPEN-210 FMOD Ex include confusion. Revert FMODEX.cmakeMonty Brandenberg
change from changeset 3d662c2f1aad. This gave the TPVDs some grief and was an unfinished attempt at cleanup.
2014-03-28storm-1831: Fixing the remaining LL_ERRS.Ima Mechanique
2014-03-28strom-1831: Cleaning out commented and unused codeIma Mechanique
2014-03-28DRTVWR-363: Fix LLNotificationsListener::listChannels() channel walk.Nat Goodspeed
LLNotifications::ChannelMap went away when LLNotificationChannel became an LLInstanceTracker subclass. Iterate the universe of channels using LLNotificationChannel::beginInstances(), endInstances() instead. More troubling is that LLNotificationChannel::getParentChannelName() went away too. When LLNotificationChannel acquired a Params block and corresponding constructor, it acquired the ability to listen on multiple upstream sources. That meant that a single mParent string became inapplicable, and its access method was removed. (Curiously, mParent was not itself removed, but it was left unused.) Change mParent to mParents, a vector<string>, built by connectToChannel(). Introduce getParents(), an accessor returning an iterator_range over that vector. Change LLNotificationsListener::listChannels() to collect a "parents" key in the map returned for each channel, and -- for backwards compatibility -- capture the first entry in the "parents" array as "parent".
2014-03-27DRTVWR-363: re-enable commented-out LLNotificationsListener::listChannels()Nat Goodspeed
and its caller.
2014-03-27Pulled merge from releaseAura Linden
2014-03-27MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: ↵maksymsproductengine
improving stability
2014-03-26storm-1831 Removing the callback after first region crossing. Prevents ↵Ima Mechanique
repeated callbacks after highlighting has been removed for live script.
2014-03-26Pull in downstream -bear, viewer-release and become version 3.7.5simon
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-26Temporary fixing of build issues in PROJECT_llimage_TEST_llimageworkermaksymsproductengine
2014-03-25MergedAura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-25It would help to specify the correct destination directory genius.Aura Linden
2014-03-25Fixed dumb mistake.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