summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Collapse)Author
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-04MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: ↵maksymsproductengine
Control named RenderAutoMuteFunctionsnot found
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Merge cleanupDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵Dave Parks
calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge downstream code / viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-02Pull from viewer-releaseMerov Linden
2013-05-02Fix line endingssimon
2013-04-24Follow-up code cleaning for LLToast work trying to get branch healthy.simon
Reviewed by Kelly
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-15MAINT-2548 : Add debug viewer render info for AV metrics. Reviewed by Kellysimon
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Mergesimon
2013-04-11CHUI-921 FIXED Default position of open floaters starts at left edge of ↵maksymsproductengine
viewer behind toolbar
2013-04-03CHUI-820 FIXED Cannot snap or move collapsed conversation window to left or ↵maksymsproductengine
right edge of viewer window
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of ↵simon
viewer-lion
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-16CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on ↵merov
Linux
2013-03-13More fixes for gcc-4.6 breakageDon Kjer
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-11Viewer-chui mergeprep
2013-03-01CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch ↵Mnikolenko ProductEngine
conversations in the list. Handle ALT + Enter to expand participant list of selected conversation.
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-22CHUI-692 FIXED Arrow keys will move avatar while IM container, nearby chat ↵maxim@mnikolenko
or IM session floater is in focus.
2013-01-14Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2012-12-19MAINT-2152 Fix for bad aspect ratio on custom resolution snapshotsDave Parks
2012-12-18MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black bordersDave Parks
2012-12-18CHUI-499: Adding ability to serialize the communication notifications to ↵William Todd Stinson
local disk per user.
2012-12-12Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
2012-12-12Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.William Todd Stinson
2012-12-11CHUI-494: Toggling the behavior of the communication notification channel ↵William Todd Stinson
filter as it should be true when not in DND mode and false when in DND mode.
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-10Correcting a mac build error.William Todd Stinson
2012-12-06CHUI-494: WIP First pass at getting the suppression of events in DND working.William Todd Stinson