summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-09-10mergeBrad Payne (Vir Linden)
2013-09-09Using transaction_id instead of raw asset_id during aisv3 patchDon Kjer
2013-09-09increment viewer version to 3.6.6Oz Linden
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-30mergeNyx Linden
2013-08-30SH-4458 FIX "Pant flares rendering as tights after SSA rollout"Nyx Linden
probably not related to SSA rollout, but we were not triggering the callbacks for baked texture loads, since the avatar object was adding paused callbacks to the callback list without properly setting the flag to indicate paused callbacks.
2013-08-30SH-4456 FIX - added info to metrics for viewer version tags.Brad Payne (Vir Linden)
2013-08-29SH-4455 WIP - versioned some metrics whose usage has changed, added name and ↵Brad Payne (Vir Linden)
item id checks in setWearableOutfit()
2013-08-29SH-4455 WIP - restrict use of LLWearableHoldingPattern metrics. When ↵Brad Payne (Vir Linden)
changing wearables, bail out if current wearables already match those requested.
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-22mergeBrad Payne (Vir Linden)
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-19moved LLTrackPhaseWrapper to do its work in destructorBrad Payne (Vir Linden)
2013-08-16merge cleanup - one file did not merge cleanly.Nyx Linden
2013-08-16mergeNyx Linden
2013-08-16merge with viewer-releaseNyx 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-14SH-4422 FIX - fixed some recently introduced issues with link description ↵Brad Payne (Vir Linden)
fields, which among other things reduces the number of appearance requests sent.
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-12mergeBrad Payne (Vir Linden)
2013-08-12cat version debug statementBrad Payne (Vir Linden)
2013-08-09Automated merge.Don Kjer
2013-08-09Routing link creating through AISv3 when available.Don Kjer
2013-08-09Refactoring link creation calls in preparation for adding AIS v3 hook.Don Kjer
2013-08-08Moved commented out capabilities debugging code into ifdef'd block and added ↵Logan Dethrow
a comment describing the use of it.
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-08-06Fixes for SH-4321. Also removed some unnecessary transform updates, and ↵prep@lindenlab.com
unused joint resetting code
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-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-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
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-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer ↵maksymsproductengine
goes blank if location is selected and a menu item is seleted
2013-07-30Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100Steven Harrison (steven)
2013-07-29Slowest debug in the west.Aura Linden