summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-03-30MAINT-3585 FIXED (Crashes when attempting to upload image.)ruslantproductengine
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-01-13merge changes for 3.7.24-releaseOz Linden
2014-12-15merge changes for 3.7.22-releaseOz Linden
2014-12-12Fix up remaining llround() -> ll_round() issuescallum_linden
2014-12-02Merge downstream code and become 3.7.22simon
2014-12-02mergeBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-11-03MAINT-3585 FIXED Viewer Crashes when attempting to upload image.ruslantproductengine
The bug was fixed, the reasone of crash is following. The Core Flow view contain another GL context and will not care about restoring a previous. I restore context manually. This path also contain a minor changes in another files. All changes described here. Сhange's for fix current bug. indra/llwindow/llwindow.h indra/llwindow/llwindowheadless.h indra/llwindow/llwindowmacosx.h indra/llwindow/llwindowsdl.h indra/llwindow/llwindowwin32.h indra/newview/lllocalbitmaps.cpp indra/newview/llviewerdisplay.cpp indra/newview/llviewerdisplay.h Twice mUsage initialization (replace to forward initialization). indra/llcharacter/lljointstate.h Looks like condition should be befor memcopy call, otherwise - possible CRASH. indra/llcommon/llmd5.cpp Unused condition and variables. indra/llmath/llsphere.cpp Looks like should be under if otherwise - possible CRASH indra\llprimitive\llmodel.cpp Useless assert's. indra/llrender/llrender.cpp indra/newview/lldaycyclemanager.cpp
2014-10-23merge changes for STORM-2081Oz Linden
2014-10-23STORM-2081 - Guard against null gWindowImplementation when fullscreen ↵Cinder
(crashes OS X Yosemite)
2014-10-17Update to build on Xcode 6.0: more removal of unused variables ↵callum_linden
[-Wunused-variable]
2014-10-17Update to build on Xcode 6.0: fix deprecated constant in OS X landcallum_linden
2014-10-13merge changes for OPEN-215Oz Linden
2014-10-13merge changes for 3.7.17-releaseOz Linden
2014-09-12MAINT-3666 FIXED Update modifiers when viewer window becomes key windowMnikolenko ProductEngine
2014-09-11MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on ↵Mnikolenko ProductEngine
mac.
2014-09-04MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only)Mnikolenko ProductEngine
2014-08-14fixed: bad behavior of input windowPell Smit
2014-08-15fixed: unwanted input window on OSXPell Smit
2014-08-14fixed: modifier key bugPell Smit
2014-08-14fixed: inline backspace bugPell Smit
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