summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-09-09Merge fix for STORM-1552 - corrupt GPU table filesimon
2013-09-09Merge viewer-releasesimon
2013-09-09increment viewer version to 3.6.6Oz Linden
2013-09-09MAINT-3048 FIXED Show actual message instead of "Only friends and groups can ↵maxim@mnikolenko
call..." for Lindens.
2013-09-06MAINT-3110 FIXED new crash in LLNotificationsUI::LLHandlerUtil::logToIMP2Pmaksymsproductengine
2013-09-05STORM-1552: detect, ignore, and delete invalid feature and gpu table filesOz Linden
2013-09-05merge from viewer-chuimaksymsproductengine
2013-09-04merge with headcallum_linden
2013-09-04MAINT-3016 FIX Viewer freeze... by reverting fix for MAINT-2849 (certain ↵callum_linden
streams do not play) - freeze more important than no play
2013-09-04MAINT-3095 FIXED Viewer crashes after opening Nearby chat history, if it is ↵dmitrykproductengine
empty
2013-09-03CHUI-836 FIXED [CHUIBUG]Opening chat history from the conversation log ↵maksymsproductengine
sometimes crashes the viewer
2013-09-04MAINT-3073 ([CHUIBUG](You) feature is irritating, especially for emotes)mberezhnoy
2013-08-30Automated merge with https://bitbucket.org/lindenlab/viewer-lionDave Parks
2013-08-30MAINT-2811 Fix for infinite loop on octree code during teleport.Dave Parks
2013-08-29MAINT-3048 FIXED Don't block IMs from Lindens even when "Only friends and ↵Mnikolenko ProductEngine
groups can call or IM me" is set
2013-08-28MAINT-2506 Fix typo in PERMISSION_SILENT_ESTATE_MANAGEMENT keyword. ↵Maestro Linden
Reviewed by Kelly.
2013-08-27MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for ↵simon
linked objects Removed "geometry" and "surface" Reviewed by Kelly
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26Tweak MAINT-3046 fix for faster remove_() performancesimon
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-23MAINT-3046 fix test regression from debug llassert accidentally checked in ↵Graham Linden
with crash fix
2013-08-23MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr ↵Graham Madarasz (Graham Linden)
so singleton cleanup doesn't do things it really ought not do
2013-08-21Merge viewer-releasesimon
2013-08-21mergemberezhnoy
2013-08-21MAINT-3020 ([CHUI] Torn off nearby chat is no longer visible after exiting ↵mberezhnoy
mouselook)
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-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-08Pull in fix for MAINT-2302simon
2013-08-07merge changes for DRTVWR-333Oz Linden
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 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-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-01Merge downstream codesimon
2013-08-01Mergesimon
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:04:33 +0000