summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-08-06mergeGilbert Gonzales
2013-08-06ACME-744: Adjusted comment to be more clearGilbert Gonzales
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 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-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-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-01ACME-761 : Use the cap for the service url unless overridden by the ↵Merov Linden
SLShareHost setting from settings.xml
2013-08-01Pull merge from lindenlab/viewer-fbcMerov Linden
2013-08-01ACME-785 : Use a specific notifytip message (without the OK button) for fbc ↵Merov Linden
success notification
2013-08-01Merge downstream codesimon
2013-08-01Mergesimon
2013-08-01ACME: add SLShareHost variable to settings.xml, which allows changing the fb ↵Gilbert Gonzales
service host location as needed.
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-01ACME-773 Making cookie clearing occur during disc and connect.Gilbert Gonzales
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-31ACME-778: Adjusted the facebook code so that isConnected() does not depend ↵Gilbert Gonzales
on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected.
2013-07-31ACME-757: Switching back to pdp15 host for testing.Gilbert Gonzales
2013-07-30Merge downstream codesimon
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 23:08:25 +0000