summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-08-01Pulled in fix for maint-4184 blurry texturesAura Linden
2014-07-23Improved commentsAura Linden
2014-07-22Merged in release.Aura Linden
2014-07-22Appears to fix MAINT-4184Aura Linden
2014-07-21merge changes for 3.7.12-releaseOz Linden
2014-07-21increment viewer version to 3.7.13Oz Linden
2014-07-11Fixed assert in llmemory.h for adjacent memory locations.Aura Linden
2014-07-09mergeBrad Payne (Vir Linden)
2014-07-09MAINT-4216 FIXBrad Payne (Vir Linden)
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
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 ↵Dave Parks
unblock RC.
2014-06-30MAINT-2980 Fix for mac cutting texture memory in half (now that we're ↵Dave Parks
cutting texture memory to default to 1/3rd of installed ram, pre-cutting is redundant).
2014-06-30MAINT-2980 Fix for AMD cards reporting system ram + vram for dedicated vram ↵Dave Parks
-- use WMI instead of DxDiag to get dedicated video memory.
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" ↵Dave Parks
default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why.
2014-06-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseMonty Brandenberg
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-23increment viewer version to 3.7.11Oz Linden
2014-06-20STORM-2035 - Invert the background color in script editors for highlighting ↵Cinder
sections. Since the background color can be changed by the user, this ensures distinctive highlighting
2014-06-20STORM-2036 - Fix trying to parse caps too early by adding a callback to ↵Cinder
check region caps when they haven't already been received
2014-06-20BUG-6425 - Init default keywords file during ctor so we have something to ↵Cinder
fallback on should caps or fetch fail
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 ↵Merov Linden
LLHTTPClient interface. Fix merge error in Facebook connect as well
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-17Post-merge cleanup. In onCompleted() restore the unconditionalMonty Brandenberg
use of setGetStatus() in case the baked texture service changes introduced some sort of hidden (and wrong) dependency. Left out the ridiculous duplicated invocation inside that failure status block. Someone damaged texture console again and apparently didn't even bother to look at their work. I'm sure they documented their changes on the public wiki as well. Unified the logging tag throughout lltexturefetch.cpp. Only way to get the cut-n- pasters to do the right thing.
2014-06-16Merge. Refresh from viewer-release after 3.7.9 release.Monty Brandenberg
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 ↵Cinder
indentation
2014-06-09Greatly simplify LLSyntaxIdLSL:Cinder
* Move file fetched callback to the singleton and handle all syntax id changes within the singleton * Remove a fair number of bool checks and method relying more on callbacks to drive syntax changes. * Don't pretty print the cache file to conserve space and to speed up xml to llsd parsing * Clean up includes
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-08Fix lsl constant highlighting and sort the if-else chain to parse a little ↵Cinder
quicker
2014-06-08Use a common SyntaxLSL broad tag to make debugging easierCinder
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 ↵Merov Linden
Received Items folders which may have been moved
2014-06-07Merge upstreamCinder
2014-06-06Merge. Bring manifest work together with bug fix work.Monty Brandenberg
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 01:13:23 +0000