summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-09-30mergingJJ Linden
2013-09-23made change to include channel name in the settings_install.xml file ↵JJ Linden
generated. changed so that sourceid is not part of a list of options pulled into that file, along with the channel
2013-09-18increment viewer version to 3.6.7Oz Linden
2013-09-16changes for additional packages to be packaged from the same build. see ↵JJ Linden
BuildParams for example environment variables used to specify the packages and their channels and sourceids. also updated mac packages to use a larger virtual drive and auto-open on download
2013-09-11NORSPEC-362 Fix leak of deferred color attachmentsGraham Linden
2013-09-09Merge viewer-release 3.6.5 CocoaGraham Linden
2013-09-09increment viewer version to 3.6.6Oz Linden
2013-09-09NORSPEC-362 address video mem leak on windows on maximizeGraham Linden
2013-09-05NORSPEC-360 fix issues with mip selection and TCs in projector fake env ↵Graham Linden
reflection
2013-08-28NORSPEC-355 NORSPEC-356 replaced llerrs with asserts to avoid crashes from ↵Graham Linden
false alarms in release
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26increment viewer version to 3.6.5Oz Linden
2013-08-26MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA ↵Graham Madarasz (Graham Linden)
modes on Mac
2013-08-19Fix merge regressions from missed changes to LoD updatesGraham Linden
2013-08-19MergeGraham Linden
2013-08-19Fix merge issues from genBBoxes optimizations fighting with genBBoxes ↵Graham Linden
optimizations and missing statics
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19Merge in viewer-releaseGraham Linden
2013-08-19MergeArun Bapu
2013-08-19increment viewer version to 3.6.4Oz Linden
2013-08-15MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()maksymsproductengine
2013-08-15NORSPEC-349 make render targets use original formats when resizing impostors ↵Graham Linden
and fix alpha for deferred impostor shader
2013-08-15NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking ↵Graham Linden
obey vertex alpha
2013-08-15NORSPEC-342 NORSPEC-352 make impostor alpha shader use vertex alpha to ↵Graham Linden
remedy unsightly blemishes, boxes, and the occasional extra wing.
2013-08-15MAINT-3012 FIXED Don't show Destination Guide by default on first run.Mnikolenko ProductEngine
2013-08-14NORSPEC-342 add simple pass type to things rendered for impostors to fix ↵Graham Linden
missing shoes/belts/handbags/cigarettecases/etc
2013-08-14Fix for NORSPEC 271 - Transparent prims in Materials Viewer are incorrectly ↵Arun Bapu
affecting depth of field by modifying the depth buffer
2013-08-13NORSPEC-342 fix the invisi-feetGraham Linden
2013-08-14BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in ↵Nicky
LLNormalTextSegment::getNumChars.
2013-08-13MAINT-2937 FIXED [CHUI] crash in LLToastIMPanelmaksymsproductengine
2013-08-12NORSPEC-342 tweak shader to work on mac og glslGraham Linden
2013-08-12NORSPEC-342 fix blocky hair in ALM from writing depth for transparent pixels ↵Graham Linden
in impostor rendering
2013-08-12NORSPEC-342 WIP MATBUG-347 make impostor rendering not contribute to depth ↵Graham Linden
for mostly-transparent buffer pixels, aka hair in ALM only
2013-08-12NORSPEC-346 fix knock-on causing alpha mask edits to cause materials to get ↵Graham Linden
removed and revert to alpha blend
2013-08-11Merge vwr-dev-matGraham Linden
2013-08-11NORSPEC-341 fix issues with water reflection coloring and abnormalsGraham Linden
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-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-05Pull merge from lindenlab/viewer-releaseMerov Linden