summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-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-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-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-05changed wording of learn more link for ACME-797Cho
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-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
2013-08-03Pull merge from lindenlab/viewer-fbcMerov Linden
2013-08-03NORSPEC-304 NORSPEC-334 NORSPEC-336 fix black glow overdraw without breaking ↵Graham Linden
glow
2013-08-02ACME-796 : Do not flip the fbc state to failure while connecting through web ↵Merov Linden
browser. Handle the dismiss case as best as possible.
2013-08-02mergeGilbert Gonzales
2013-08-02ACME-744: Temporary solution. The internal browser was not setting keyboard ↵Gilbert Gonzales
focus properly...as to why an investigation is needed. For now explicly setting keyboard focus to the internal browser after it is displayed.
2013-08-03made checkin use a placeholder location URL when the given SLURL is not validCho
2013-08-02mergeGilbert Gonzales
2013-08-02Switching SLShareHost to pdp locationGilbert Gonzales
2013-08-02added learn more link to panel_social_account for ACME-797Cho
2013-08-02Pull merge from lindenlab/viewer-fbcMerov Linden
2013-08-02ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just ↵Merov Linden
after launch
2013-08-02changed facebook_post_success text to be more consistent with other ↵Cho
notification text for ACME-793
2013-08-02changed PLACE to CHECK IN for ACME-794Cho
2013-08-02MAINT-2914 FIXED Mousing over UI elements does not make them light updmitry