summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-22mergeBrad Payne (Vir 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-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-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-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
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-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-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-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-28storm-1831: Fixing the remaining LL_ERRS.Ima Mechanique
2014-03-28strom-1831: Cleaning out commented and unused codeIma Mechanique
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 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-24merge changes for 3.7.4-releaseOz 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