summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26Tweak MAINT-3046 fix for faster remove_() performancesimon
2013-08-26correct merge error in llupdatechecker.cppOz Linden
2013-08-26remove unused --logevents command line option because new validation causes ↵Oz Linden
unmapped options to be errors
2013-08-26merge 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-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-22merging viewer releaseGilbert Gonzales
2013-08-22merge changes for maint-2773Oz Linden
2013-08-22MAINT-2773: Disable texture animation doesn't workAnsariel
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-21merge changes for storm-1953Oz Linden
2013-08-21merge changes for storm-1952Oz Linden
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19Fix merge regressions from missed changes to LoD updatesGraham Linden
2013-08-19MergeGraham Linden
2013-08-19Fix merge issues from genBBoxes optimizations fighting with genBBoxes ↵Graham Linden
optimizations and missing statics
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-19Merge in viewer-releaseGraham Linden
2013-08-19MergeArun Bapu
2013-08-19increment viewer version to 3.6.4Oz Linden
2013-08-15MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()maksymsproductengine
2013-08-15NORSPEC-349 make render targets use original formats when resizing impostors ↵Graham Linden
and fix alpha for deferred impostor shader
2013-08-15NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking ↵Graham Linden
obey vertex alpha
2013-08-15NORSPEC-342 NORSPEC-352 make impostor alpha shader use vertex alpha to ↵Graham Linden
remedy unsightly blemishes, boxes, and the occasional extra wing.
2013-08-15MAINT-3012 FIXED Don't show Destination Guide by default on first run.Mnikolenko ProductEngine
2013-08-14NORSPEC-342 add simple pass type to things rendered for impostors to fix ↵Graham Linden
missing shoes/belts/handbags/cigarettecases/etc
2013-08-14merge changes for STORM-1932Oz Linden
2013-08-14removed momentary error message upon connecting to FacebookCho
2013-08-14Fix for NORSPEC 271 - Transparent prims in Materials Viewer are incorrectly ↵Arun Bapu
affecting depth of field by modifying the depth buffer
2013-08-13NORSPEC-342 fix the invisi-feetGraham Linden
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-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-12NORSPEC-342 tweak shader to work on mac og glslGraham Linden
2013-08-12NORSPEC-342 fix blocky hair in ALM from writing depth for transparent pixels ↵Graham Linden
in impostor rendering
2013-08-12NORSPEC-342 WIP MATBUG-347 make impostor rendering not contribute to depth ↵Graham Linden
for mostly-transparent buffer pixels, aka hair in ALM only
2013-08-12Save SL NVAPI profile only when changes have been made.dolphin
2013-08-12NORSPEC-346 fix knock-on causing alpha mask edits to cause materials to get ↵Graham Linden
removed and revert to alpha blend
2013-08-11Merge vwr-dev-matGraham Linden