summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2014-07-21Merge with head of viewer-releaseCallum Prentice
2014-07-21increment viewer version to 3.7.13Oz Linden
2014-07-15Merge with headCallum Prentice
2014-07-15Merge with viewer-releaseCallum Prentice
2014-07-09mergeBrad Payne (Vir Linden)
2014-07-09MAINT-4216 FIXBrad Payne (Vir Linden)
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-07-07increment viewer version to 3.7.12Oz Linden
2014-07-07MAINT-2980 Back out most changes related to upping the 512MB texture cap to u...Dave Parks
2014-06-30MAINT-2980 Fix for mac cutting texture memory in half (now that we're cutting...Dave Parks
2014-06-24STORM-2035 - Looking for a good selection box contrastCinder
2014-06-24Merge viewer-release and become version 3.7.11simon
2014-06-23Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2014-06-23MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" de...Dave Parks
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-23increment viewer version to 3.7.11Oz Linden
2014-06-20Fixing some merge screwups someone in the last 10,000 comnitscallum_linden
2014-06-20STORM-2035 - Invert the background color in script editors for highlighting s...Cinder
2014-06-20STORM-2036 - Fix trying to parse caps too early by adding a callback to check...Cinder
2014-06-20BUG-6425 - Init default keywords file during ctor so we have something to fal...Cinder
2014-06-19Pulled fix for MAINT-3154Aura Linden
2014-06-18Pulled merge from release.Aura Linden
2014-06-17Retropedaling on SH-4030 fix that crashes my viewer on logginMerov Linden
2014-06-17DRTVWR-354 : Rewrite Responders for Twitter and Flickr to conform to new LLHT...Merov Linden
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-16Merge with head of viewer-releaseCallum Prentice
2014-06-16correct merge mistakeOz Linden
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-16increment viewer version to 3.7.10Oz Linden
2014-06-09STORM-2026 - Use more unique syntax colors by default, also clean up some ind...Cinder
2014-06-09Greatly simplify LLSyntaxIdLSL:Cinder
2014-06-09MAINT-4001 : Pull merge in viewer-tiger for quick releaseMerov Linden
2014-06-09Fix for maint-3154 alt-zoom zooms way outAura Linden
2014-06-08Capitalize script colors floater for consistency.Cinder
2014-06-08Don't allow script colors floater resizeCinder
2014-06-08Update syntax color floater with recent changes.Cinder
2014-06-08Update sample script in script colors floaterCinder
2014-06-08"sections" is apparently unused as well.Cinder
2014-06-07MAINT-4001 : Make Received Items not movable (protected), consolidate Receive...Merov Linden
2014-06-07Merge upstreamCinder
2014-06-06MAINT-4137: Correcting a potential crash. This change should fix the most pr...Stinson Linden
2014-06-06MAINT-4137: Correcting some poorly written CPP code that could potentially le...Stinson Linden
2014-06-06fix for Windows line endings - converted to Unix stylecallum_linden
2014-06-05MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.Stinson Linden
2014-06-06Correcting a build error.Stinson Linden
2014-06-05MergeRicky Curtice
2014-06-04A little more cleanup in LLSyntaxIDLSL and LLKeywordsCinder
2014-06-04STORM-2025: Part 2 - After consulting with Oz, remove subcategories of consta...Cinder
2014-06-04make "default" a constant, and remove that and "state" from eventsOz Linden