summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-08ACME-821 : Use 128x128 png for the default tile icon instead of 300x300 jpgMerov Linden
2013-08-08Pull in fix for MAINT-2302simon
2013-08-08MAINT-2847 (Updater notification - message shows as ↵MaximB ProductEngine
"[[RELEASE_NOTES_FULL_URL] information about this update]")
2013-08-07ACME-820 : Let checkin checkbox be available and swap tile map / default ↵Merov Linden
tile when toggling
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-07ACME-814 : Disable Post in Photo panel while the preview is processingMerov Linden
2013-08-07Mergesimon
2013-08-07MAINT-2257 : Create ability to limit region/estate and parcel access bysimon
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-08-07Merged lindenlab/viewer-release into defaultCinder Roxley
2013-08-07NORSPEC-343 protect against edits that would set non-alpha faces to diffuse ↵Graham Linden
alpha mode blend
2013-08-07truncate gpu id strings to 100 characters (avoids diff problems)Oz Linden
2013-08-07add line number of recognizer to diff reportOz Linden
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-06ACME-801: Adding a suggested friend as a friend does not remove them from ↵Gilbert Gonzales
the suggested friend list
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-06mergeGilbert Gonzales
2013-08-06ACME-744: Adjusted comment to be more clearGilbert Gonzales
2013-08-06Mergedmitry
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 updatesimon
2013-08-05Mergesimon
2013-08-05MAINT-2966 : Add viewer alert info for "NoEnterRegionMaybeFull"simon
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-05Pull merge from lindenlab/viewer-releaseMerov 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-05Added tag 3.6.2-release for changeset f6741d5fe8d6Oz Linden
2013-08-05changed wording of learn more link for ACME-797Cho
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-05open-185: remove duplicate gperftools entry in autobuild.xmlOz Linden
2013-08-05NORSPEC-285 NORSPEC-293 NORSPEC-298 fix ighting diffs between ↵Graham Linden
alpha/non/ALM/non-ALM
2013-08-05MAINT-822 FIXED [PUBLIC]Inventory window should focus on search fielddmitry
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