summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-22MergeXiaohong Bao
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-22add Cinder Roxley to contributors for STORM-1831Oz Linden
2014-04-21Pull and merge DRTVWR-364simon
2014-04-21merge changes for 3.7.6-releaseOz Linden
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-21Added tag 3.7.6-release for changeset d029faf69f20Oz Linden
2014-04-21Another oops windows build fix.Cinder
2014-04-21Windows build fix.Cinder
2014-04-18Reinstate support text appendText() in LLFloaterAboutCinder
2014-04-18Remove clearHighlights()Cinder
2014-04-18Move some more script editor functions from LLTextEditor to LLScriptEditorCinder
2014-04-18Fix header guardCinder
2014-04-18Remove calls to now unused methodsCinder Biscuits
2014-04-18STORM-2023: Restore system color picker on OSXCinder Biscuits
2014-04-18Trivial typo fixCinder
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-16Undo of overzealous removal.Aura Linden
2014-04-16Orphaned definitionCinder
2014-04-16bool not U32Cinder
2014-04-15maint-5707 window should no longer be displayed.Aura Linden
2014-04-15Disabled 'Sending to server Try N' messages from crash reporting.Aura Linden
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-08revived some deleted files to get mac build workingRichard Linden
2014-04-08added SKIP_AUTORUN command line flag to disable automatically running viewer ↵Richard Linden
after install
2014-04-08merge changes for 3.7.5-releaseOz Linden
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-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-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-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-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".