summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-11MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to ↵maksymsproductengine
voorhees_groupban.
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
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-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-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.
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-04All: Update .png files with conformance problems as reported by pngfix.Monty Brandenberg
With the updated PNG library (1.6.8), we're getting stderr warnings about non-conformance issues with images in the build. These warnings include: * iCCP: known incorrect sRGB profile * iCCP: profile 'ICC Profile': 1000000h: invalid rendering intent * iCCP: cHRM chunk does not match sRGB These were normalized by running an ImageMagick 'convert -strip' pass over each PNG image. 'compare -metric AE' reports 0 delta for all before/after pairs.
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-03All: Committing to llqtwebkit2 and the future. Updating all libraries.Monty Brandenberg
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom to 290576, curl to 290567, fontconfig to 290569, freetype to 290557, google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit to 290578, openssl to 290560, PCRE to 290406, zlib to 290556. Document compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake. It is the README for the building process based on things learned during this library project. Switch building process back to style used for new llqtwebkit2 repo. This builds shared libraries for Qt4 products on all platforms using current build machines and TC task templates. All platforms are building. All have comparable FPS rates. Builds are getting quieter. Forward, comrades!
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-28Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.Monty Brandenberg
Release and Debug builds working. Remove the DOM_DYNAMIC define so that we don't create declspec declarations to colladadom objects and pull in libxml2_a (_a for archive) to complete the link. Debug functional and would be moreso if not for all the CrtCheckMemory() calls.
2014-05-28All: Update library SDL to 290309, c-ares to 290089, boost to 290191,Monty Brandenberg
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255, google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157, llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083, pcre to 290150, zlib to 290080. The freetype2 headers are now normalized to what they would normally be on a unix-type system. Libxml2 and pcre are available on all platforms. Libraries generally move in the direction of static archives rather than shared libraries (e.g. openssl). The llqtwebkit side is a step back from the more ambitious goal. What will be used (290262) will be a simple rebuild of the existing 4.7.1 library with updated package dependencies. The bigger work will be in the future.
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-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-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-22Merge. Pull in viewer-release after release of 3.7.8Monty Brandenberg
2014-05-20Merge release and 3.7.9simon
2014-05-20MAINT-4009: Patching a leak of LLPluginSharedMemory objects from the ↵Stinson Linden
LLPluginProcessParent class.
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 03:43:50 +0000