summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-07-07Merge downstream code and become 3.7.12simon
2014-06-30MAINT-2980 Fix for AMD cards reporting system ram + vram for dedicated vram ↵Dave Parks
-- use WMI instead of DxDiag to get dedicated video memory.
2014-06-18Merge downstream codesimon
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-05MergeRicky Curtice
2014-05-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Stinson Linden
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-24MAINT-4009: Correcting a pointer deletion that should have correctly been an ↵Stinson Linden
array deletion.
2014-04-22merge changes for STORM-2023Oz Linden
2014-04-18Remove calls to now unused methodsCinder Biscuits
2014-04-18STORM-2023: Restore system color picker on OSXCinder Biscuits
2014-04-14OPEN-215: Replace deprecated call to kCGLRPTextureMemory with ↵Cinder Biscuits
kCGLRPTextureMemoryMegabytes
2014-04-08MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without any other ↵Mnikolenko ProductEngine
key being pressed simultaneously.
2014-03-13OPEN-209: Corrected all instances of trigraphs in the code.Ricky Curtice
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-12merge with releaseRichard Linden
2014-03-11Automated merge with https://bitbucket.org/lindenlab/viewer-lionDave Parks
2014-03-11MAINT-3786 FIXED When bringing focus back to the viewer with a single clickandreylproductengine
in world view, a double click teleport to clicked point happens under certain circumstances
2014-02-27Automated merge with https://bitbucket.org/lindenlab/viewer-lionDave Parks
2014-02-27MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and ↵Dave Parks
increase limit. Limit should be however much vram is installed, but underneath the hood, fudge how much memory is used for textures to avoid swapping. Also, catch exceptions when attempting to build a GL context on windows and display an error dialog instead of crashing.
2014-02-12merge with releaseRichard Linden
2014-02-10Merge downstream code with viewer-releasesimon
2014-02-18Pull in viewer-lion to lock down next releasesimon
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2013-12-17Mac Fullscreen fix for MAINT-3288 and MAINT-3135Aura Linden
2013-12-03MAINT-3506 FIXED Allocate appropriate amount of memory for temp variable.Mnikolenko ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11merge changes for 3.6.10-releaseOz Linden
2013-11-06merge with releaseRichard Linden
2013-11-05Shot in the dark patch for MAINT-3353 backported from viewer-tigerAura Linden
2013-10-29BUG-3968: do not wear an object when renaming in inventoryTonya Souther
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-09-26MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for ↵Graham Madarasz (Graham Linden)
SLURL handling
2013-09-19Merge with bitbucket.org/msavchenko/viewer-release-maint-3132maksymsproductengine
2013-09-17MAINT-3161 : Clean up avatar muting code and prototype featuresimon
2013-09-12MAINT-3135 WIP partial fix, addresses graphics corruption on resize, but not ↵Graham Madarasz (Graham Linden)
mouse mapping issues
2013-09-12merge changes for open-189Oz Linden
2013-09-11OPEN-189 Add missing header guardDrake Arconis
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Merge viewer-releasesimon
2013-09-09merge changes for 3.6.5-releaseOz Linden
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon