summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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 ↵Merov Linden
Received Items folders which may have been moved
2014-06-07Merge upstreamCinder
2014-06-06MAINT-4137: Correcting a potential crash. This change should fix the most ↵Stinson Linden
probable location of a callstack being reported by the crash reporter. However, there is no reproduction yet, so hard to test whether this actually patches the crash occcurrence.
2014-06-06MAINT-4137: Correcting some poorly written CPP code that could potentially ↵Stinson Linden
lead to problems in the future.
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 ↵Cinder
constants and fix highlighting
2014-06-04make "default" a constant, and remove that and "state" from eventsOz Linden
2014-06-04MAINT-4113 FIXED Get total contribution as sum of parcels' billable area.maxim@mnikolenko
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-05-31MAINT-4114: Refactoring the LLBadge code to ensure a parent view always has ↵Stinson Linden
the badge (to preserve memory cleanliness), but to also allow for badge reparenting so that the NEW badge works in the inventory window. This change relates to 9e0d629da1487f850beb2767bd47734c4ccc393e.
2014-05-29MAINT-4106: Correcting crash on exit behavior during normal shutdown. With ↵Stinson Linden
the more comprehensive texture cleanup going on, this code was causing an crash on exit when gAgentAvatarp was null. Adding a check for null before proceeding.
2014-05-29Fix files apparently missed by whomever did the great log macro renaming ↵Graham Linden
(pox be upon them)
2014-05-29Mergeup to 3.7.9 viewer-releaseGraham Linden
2014-05-28Make default and state out of flow-control and into eventsCinder
2014-05-28Don't hardcode black as the default color for syntaxCinder
2014-05-28MAINT-4070 FIXED Use icon in urls when content is trusted.maxim@mnikolenko
2014-05-27MAINT-4009: Ensuring that the view listeners are properly cleaned up at app ↵Stinson Linden
close.
2014-05-20Merge release and 3.7.9simon
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-20MAINT-4009: Ensuring that the cookie store is properly cleaned on app exit.Stinson Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Stinson Linden
2014-05-19increment viewer version to 3.7.9Oz Linden
2014-05-19merge fix for merge with project interesting. New appearance utility source ↵Nyx Linden
and one quick doubly-declared typedef.
2014-05-16MAINT-4009: First pass refactoring to eliminate memory related to error ↵Stinson Linden
reporting that is not properly cleaned up.
2014-05-16merge fixBrad Payne (Vir Linden)
2014-05-16Update syntax coloring in the preview script on the fly.Cinder
2014-05-16Trivial indentation change in floater_script_ed_prefs.xmlCinder
2014-05-16Typo fixCinder
2014-05-16merge fixesBrad Payne (Vir Linden)
2014-05-16Set colors for script editorCinder
2014-05-16Merge upstreamCinder
2014-05-15fix for bad mergeBrad Payne (Vir Linden)
2014-05-14Color syntax in script colors floaterCinder
2014-05-14Clean up LLSyntaxIdLSL ctorCinder
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-14clean up the constructor for LLSyntaxIdLSLOz Linden
2014-05-14Refactor more script editor properties away from LLTextEditor to LLScriptEditorCinder
2014-05-14Begin syntax coloring personalizationCinder