summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-22merge changes for STORM-2023Oz Linden
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-22mergeBrad Payne (Vir Linden)
2014-04-21Merge downstream codesimon
2014-04-21Pull and merge DRTVWR-364simon
2014-04-21merge changes for 3.7.6-releaseOz Linden
2014-04-21Merge downstream codesimon
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-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-09Merge downstream codesimon
2014-04-09MAINT-2034 : Terrain texture changes caused by changing texture elevationsimon
ranges or terraforming can not be seen until after relog or teleporting out and back to the region
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-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-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-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"