summaryrefslogtreecommitdiff
path: root/indra
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-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-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-05DD-114, DD-115, DD-116: Fixed counts on folder, folder depth and items on ↵Merov Linden
operations on marketplace listings
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-04DD-84 : Final clean up for this fixMerov Linden
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-03DD-84 : Fix all active listing modification actions. Add specific message ↵Merov Linden
when listing will unlist. Make update skip consistency check when called from internal level (not public API).
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-06-02DD-92 : WIP : Use the new LLCurl::Responder interface. Marketplace Listings ↵Merov Linden
functional again.
2014-06-02DD-92 : WIP : Fixed a compilation error introduced by my previous commitMerov Linden
2014-05-31DD-92 : Clear llinfos compilation warning and similarMerov Linden
2014-05-30Retropedaling on SH-4030 fix that crashes my viewer on logginMerov 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-30DD-92 : pull merge lindenlab/sunshine-external to get AISv3 workMerov Linden
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-30DD-84 : Prompt the user for active listing edits (Cut, Paste and Delete).Merov Linden
2014-05-29DD-84 : WIP : Get DAMA to display for drag and drop. Note that, because of ↵Merov Linden
current SLM issues, it works on version folders, active or not.
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-28DD-84 : WIP : Add confirmation DAMA dialog when moving items in active listingMerov Linden
2014-05-28DD-91 : Fixed! Get each listing to pass through the folder/size check on ↵Merov Linden
validation. Make all messages localizable. General clean up
2014-05-28Half of STORM-2025, fix flow-control highlightingCinder
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-28DD-91 : WIP : Continue refactor of item checking in marketplace and simplify ↵Merov Linden
error messages
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-23DD-91 : WIP : Refactor code testing the validity of a drag, drop or paste of ↵Merov Linden
a folder or item in the marketplace
2014-05-24MAINT-4009: Patching a memory leak of ParamDescriptor objects.Stinson Linden
2014-05-23MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class ↵Stinson Linden
and all of its derived descendants in order to clarify ownership of memory pointers.
2014-05-22DD-103 : Use the same logic than Drag and Drop for Paste operations. Prompt ↵Merov Linden
with dialog instead of tooltip though.
2014-05-21DD-91 : WIP : Fix taking the correct root folder (merchant outbox or ↵Merov Linden
marketplace listings) into account
2014-05-21DD-91, DD-84 : WIP : Verify restrictions when moving things to marketplace, ↵Merov Linden
provide clear alert for errors, parametrize alerts and tooltips correctly
2014-05-20DD-88 : Make Drag and Drop tooltips for Merchant Outbox and Marketplace ↵Merov Linden
restrictions identical
2014-05-20Merge release and 3.7.9simon