summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-09-09Pull from lindenlab/viewer-releaseMerov Linden
2013-09-09ACME-906 : Clean up xml from overzealous background color and opacity settingsMerov Linden
2013-09-09increment viewer version to 3.6.6Oz Linden
2013-09-06ACME-905 : Get the FacebookConnect cap each time we need it (it's not that much)Merov Linden
2013-09-06ACME-903: Link the 'Learn about posting to Facebook' text to the proper KB ↵Gilbert Gonzales
article
2013-09-03ACME-789: Remove SLShareHost setting from settings.xmlGilbert Gonzales
2013-08-29ACME-866 User receives error when hitting Disconnect in Facebook floater, if ↵Gilbert Gonzales
access token was cleared manually on backend: Problem was that when the user was already disconnected the Facebook connection state was not being set to disconnected.
2013-08-29removing test codeGilbert Gonzales
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-27merge changes for 3.6.4-releaseOz 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-24added Google Analytics query parameters to URLs for FBC photos and checkins ↵Cho
for ACME-854
2013-08-22merging viewer releaseGilbert Gonzales
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-19increment viewer version to 3.6.4Oz Linden
2013-08-15MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()maksymsproductengine
2013-08-15MAINT-3012 FIXED Don't show Destination Guide by default on first run.Mnikolenko ProductEngine
2013-08-14removed momentary error message upon connecting to FacebookCho
2013-08-13MAINT-2937 FIXED [CHUI] crash in LLToastIMPanelmaksymsproductengine
2013-08-12Pull merge from viewer-fbcMerov Linden
2013-08-12ACME-820 : Use the LL hosted default image for the default map tile in checkinMerov Linden
2013-08-13added read_from_master parameter for ACME-829Cho
2013-08-09ACME 824: Suggested Friends do not repopulate if you disconnect and ↵Gilbert Gonzales
reconnect to Facebook API in same viewer session
2013-08-09mergeGilbert Gonzales
2013-08-09ACME-800: Posted to Facebook notifications persist in the ↵Gilbert Gonzales
open_notifications.xml file per user
2013-08-08ACME-821 : Use 128x128 png for the default tile icon instead of 300x300 jpgMerov Linden
2013-08-07ACME-820 : Let checkin checkbox be available and swap tile map / default ↵Merov Linden
tile when toggling
2013-08-07ACME-814 : Disable Post in Photo panel while the preview is processingMerov Linden
2013-08-07merge changes for DRTVWR-333Oz 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-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-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-05Pull merge from lindenlab/viewer-releaseMerov 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-03Pull merge from lindenlab/viewer-fbcMerov Linden
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