summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-17MergeRichard Linden
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-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17STORM-2034 Adjust comment block indentJonathan Yap
2014-06-16viewer-release mergeChris Baker
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-16Added tag 3.7.9-release for changeset a9f2d0cb11f7Oz Linden
2014-06-13DD-82 : Update marketplace listings after delete, cut and other operations ↵Merov Linden
on selected items
2014-06-11DD-98 : Add message with link to marketplace if listing cannot be editedMerov Linden
2014-06-11DD-130 : Count all folders and subfolders from the version folder excluding ↵Merov Linden
the version folder itself
2014-06-11DD-126 : Ask for confirmation when moving a version folder in a way that ↵Merov Linden
will deactivate it
2014-06-11STORM-2034 Fix and improve processing when hours overflow to daysJonathan Yap
2014-06-11MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to ↵maksymsproductengine
voorhees_groupban.
2014-06-10DD-107, DD-111 : Add a tooltip to indicate why you can't move an active listingMerov Linden
2014-06-10STORM-2034 Made small coding change per Oz's requestJonathan Yap
2014-06-10DD : Clean up marketplace listings folder creation so we create it in only ↵Merov Linden
one place
2014-06-10STORM-2034 Try to fix incorrect logic about increasing and decreasing filtering.Jonathan Yap
Minor XML adjustment.
2014-06-09DD-115, DD-130 : Fixed. Count items and folders from the version folder, not ↵Merov Linden
the listing root
2014-06-09DD-126 : Fixed. Check that the version folder depth is 2 when enforcing ↵Merov Linden
consistency rules
2014-06-09DD-97 : When clearing the version folder of a record, force activation ↵Merov Linden
(listed) status to false at the same time, avoiding confusing (and eventually wrong) double call to updateSLMListing
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-09DD-107, DD-111 : Fixed! Do not allow active listing and version folders to ↵Merov Linden
be moved or cut or deleted (must unlist first).
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-09STORM-2034 Trivial code cleanupJonathan Yap
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-07STORM-2034 Add persistence for new setting, more XML formatting changes,Jonathan Yap
Fix two issues with how hours and days are calculated and displayed
2014-06-06Merge. Bring manifest work together with bug fix work.Monty Brandenberg
2014-06-06BUG-3323/SH-4375 Server side baking not baking AVs over cellular network.Monty Brandenberg
This is a workaround that the TPVs have been exercising for quite a few months and it does seem to fix the OPs problem. The solution is based on magic numbers and has no technical basis, it's just an artifact of particular networking gear and/or ISPs.
2014-06-06STORM-2034 Add a constant, try to fix some datetime logic filtering errorsJonathan Yap
2014-06-06STOMR-2034 XML adjustments and a bit of code cleanupJonathan Yap
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-05All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663.Monty Brandenberg
Linux: Include libQtXml and libQtSvg in manifest for libqsvg.so. More documentation thoughts for library package structure.