summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-08-07Create separate high/low water level limits for GetMesh andMonty Brandenberg
GetMesh2 capabilities. They should be independent now.
2013-08-07NORSPEC-343 fix oversight and actually apply override to new material when ↵Graham Linden
no alpha is present
2013-08-07NORSPEC-342 fix alpha objects appearing black in impostor imagesGraham Madarasz (Graham Linden)
2013-08-07NORSPEC-343 protect against edits that would set non-alpha faces to diffuse ↵Graham Linden
alpha mode blend
2013-08-07NORSPEC-329 fix mangling of diffuse alpha mode by material edits when only ↵Graham Linden
one face really has alpha
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-08-07NORSPEC-342 WIP fix issues with skimpy clothes getting too skimpy in impostorsGraham Linden
2013-08-06NORSPEC-322 NORSPEC-342 WIP fix black deferred impostors, lighting bugs remainGraham Madarasz (Graham Linden)
2013-08-06SH-4411 Thread/mutex rework between main and worker threadMonty Brandenberg
Have the ::notifyLoadedMeshes() method doing correct locking and stall avoidance at the same time. This method now does lazy mutex lock acquisition (trylock()) and if it fails on either, it gives up and comes back later. Capture the maximum number of sequential failures and report this at the end of the run in the log. (So far, with big mesh regions, I've only seen 1s and 2s.) Locking/mutex requirements sorted in other locations as well. LLMutex gets trylock() method as well as new LLMutexTrylock scoped locking class. Clean up some documentation, more to do.
2013-08-06NORSPEC-322 NORSPEC-342 fix issues with black impostors and missing alpha ↵Graham Linden
attachments on impostors
2013-08-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-08-05CHOP-951, IQA-1477: Validate args for numeric command-line switches.Nat Goodspeed
The logic in llcommandlineparser.cpp's setControlValueCB() callback function for converting command-line switch argument values from string to the actual type of the map-to settings variable had a couple special cases for boolean and LLSD array. But for S32, U32 and F32, it simply used default LLSD string-to-numeric conversion. LLSD's string-to-numeric conversion is a bit lame: for non-numeric strings, it shrugs and returns 0. Introduce onevalue() and badvalue() helper functions that, like certain errors during command-line parsing, throw LLCLPError. Use them to streamline certain redundancies in setControlValueCB(). Introduce convertTo<T>() helper function that uses boost::lexical_cast() for slightly more stringent conversions. Add cases for U32, S32 and F32 targets. setControlValueCB() is actually called only by LLControlGroupCLP::notify(), not during actual command-line parsing. Make LLControlGroupCLP::notify() return bool. Make it catch LLCLPError, set the error for getErrorMessage() and return false on that exception. Package LLAppViewer::initConfiguration()'s response to initParseCommandLine() returning false as a new handleCommandLineError() function; invoke it both there and when LLControlGroupCLP::notify() returns false.
2013-08-05Added some simple counters to the mesh repository code and thenMonty Brandenberg
added a Mesh status line to the texture fetch console. Mesh is often in competition with textures and so the mesh information seems appropriate there. Do get a nice feel for progress and you definitely see when the throttles kick in.
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05Pull merge from lindenlab/viewer-releaseMerov Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05Merge viewer-release with Vivox codesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05increment viewer version to 3.6.3Oz Linden
2013-08-05Change the setting for GetMesh2 meshes to Mesh2MaxConcurrentRequests.Monty Brandenberg
While linking GetMesh2 to the old setting was simpler from a user point-of-view, they really shouldn't be linked and the old one will go away. This one may be renamed to AssetMaxConcurrentRequests or something similar if we get to the mesh/texture unification step.
2013-08-05NORSPEC-304 NORSPEC-336 another attempt as resolving black glow overdraw ↵Graham Madarasz (Graham Linden)
without breaking glow (even for alpha-blended) faces
2013-08-05NORSPEC-336 intentionally rebreak 304 to fix glow while we find a fix that ↵Graham Linden
works for both
2013-08-05NORSPEC-285 NORSPEC-293 NORSPEC-298 fix ighting diffs between ↵Graham Linden
alpha/non/ALM/non-ALM
2013-08-04NORSPEC-305 -NORSPEC-335 fix scale and HUD anim regression from materials ↵Graham Linden
changes in CL 28424
2013-08-03NORSPEC-332 fix fullbright tex indexing failGraham Linden
2013-08-03NORSPEC-304 NORSPEC-334 NORSPEC-336 fix black glow overdraw without breaking ↵Graham Linden
glow
2013-08-02CHOP-959: merge --graphicslevel fix up to tipNat Goodspeed
2013-08-02CHOP-959: Honor --graphicslevel switch even on first viewer run.Nat Goodspeed
Previous CHOP-959 logic set a flag to remember that settings variable RenderQualityPerformance was set (by --graphicslevel), so it could be applied once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow constructor calls LLFeatureManager::applyRecommendedSettings(), which resets that settings variable! So don't just set a flag, actually capture the requested RenderQualityPerformance value for later.
2013-08-01Merge downstream codesimon
2013-08-01NORSPEC-336 fix glow regression from 304 fixGraham Linden
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01MAINT-2949 : Objects across the sim border do not render when approached. Addedsimon
missing code block from previous change as per Dave P's advice
2013-08-01NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggleGraham Madarasz (Graham Linden)
2013-07-30Merge downstream codesimon
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehowGraham Linden
2013-07-30SH-4371 Reduce 22mS inter-connection latency.Monty Brandenberg
This really extended into the client-side request throttling. Moved this from llmeshrepository (which doesn't really want to do connection management) into llcorehttp. It's now a class option with configurable rate. This still isn't the right thing to do as it creates coupling between viewer and services. When we get to pipelining, this notion becomes invalid.
2013-07-30NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac ↵Graham Madarasz (Graham Linden)
10.6.8 nV driver issues
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on MacGraham Madarasz (Graham Linden)
2013-07-29SH-4368 Adjust upload timeout parameters for slow networks.Monty Brandenberg
Generally sorted the mesh timeout parameters for maximum transport time (staying with default 30 for connect). 60S for normal meshes, 600S for large. Also documented default option values in httpoptions.h. Useful to have these. In the future, the timeouts might go into standard llsd options where they can be tracked a bit more.
2013-07-28NORSPEC-314 fixed another mac-specific stupidity by splitting out a new ↵Graham Madarasz
srgb_mac version of the shader
2013-07-28NORSPEC-314 fix the fullbright alpha mask logicGraham Madarasz
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed