summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-26Merge. Pull in viewer-release after SSA merge.Monty Brandenberg
2013-08-26Merge. Refresh from viewer-release after SSA.Monty Brandenberg
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-26Okay, move openssl back to the weird 0.9.8/1.0.0 mix it wasMonty Brandenberg
before. Move libcurl forward to 7.24.0 and built on 0.9.8. Until we do some TC work, we may be stuck with this combo.
2013-08-26increment viewer version to 3.6.5Oz Linden
2013-08-26Added tag 3.6.4-release for changeset 91ed595b716fOz 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-23Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkitMonty Brandenberg
so that doesn't move. 3p-curl does, however, and this gets them all. I suspect I'll be backing down to 0.9.8 next week.
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-22Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http-3Monty Brandenberg
2013-08-22Okay, move openssl back to 0.9.8q as we have compiler issuesMonty Brandenberg
on the build farm. This, at least, gets us through the openssl-> libcurl->viewer dependency chain.
2013-08-22merging viewer releaseGilbert Gonzales
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-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-19Added tag 3.6.3-release for changeset fe4f7c5e9fd2Oz Linden
2013-08-19Add 'internal'/'external' token to DEBUG retry message so that dev/QAMonty Brandenberg
can know exactly where a retry value was sourced.
2013-08-16SH-4407 Tuning to get new code working as well.Monty Brandenberg
Do some runtime code avoidance and skip unnecessary libcurl and syscall invocations.
2013-08-15SH-4410 Internal Documentation. Update and correct the mutex/dataMonty Brandenberg
lists to reflect current. Describe the functional flow of things for a single LOD request. Put together to-do list for follow on work. Knock down the low/high water limits for GetMesh a bit, 100/200 too high, 75/150 should be better, vis-a-vis pathological failures.
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-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-13MAINT-2861 FIXED llAdjustSoundVolume causes animated textures on same object ↵maksymsproductengine
to reset to first frame
2013-10-24Get fix for MAINT-3338simon
2013-10-24Pull in viewer-release with fbc / snowstormsimon
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-23increment viewer version to 3.6.10Oz Linden
2013-10-23Added tag 3.6.9-release for changeset 70eda3721d36Oz Linden
2013-10-21MAINT-3338 fix disable of particle glow on false suspicion of lying network dataGraham Linden