89321a56fd
increment viewer version to 3.7.29
2015-04-28 12:03:31 +03:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
90573badb4
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
a6ff7db101
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
de5307ab1d
MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro & cause found for BUG-7753
2015-03-05 19:03:23 +02:00
905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
4c597c548f
Fix up remaining llround() -> ll_round() issues
2014-12-12 11:03:56 -08:00
4f076daeff
Merge downstream code and become 3.7.22
2014-12-02 10:41:20 -08:00
6cffbfba8b
merge
2014-12-02 14:48:45 -05:00
fe5ff3e74a
merge
2014-12-01 16:21:52 -05:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
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-11-03 20:05:20 +02:00
a837281a77
merge changes for STORM-2081
2014-10-23 16:07:31 -04:00
47854b6218
STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite)
2014-10-23 12:45:05 -06:00
392d63efac
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:39:48 -07:00
73224a952a
Update to build on Xcode 6.0: fix deprecated constant in OS X land
2014-10-17 15:39:13 -07:00
e43f3f4dae
merge changes for OPEN-215
2014-10-13 17:21:22 -04:00
852426d71e
merge changes for 3.7.17-release
2014-10-13 17:13:15 -04:00
b75d2f7c3f
MAINT-3666 FIXED Update modifiers when viewer window becomes key window
2014-09-12 11:30:52 +03:00
c62ac0cae7
MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on mac.
2014-09-11 11:59:19 +03:00
7d9372b96d
MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only)
2014-09-04 14:13:47 +03:00
ce7e8eb952
fixed: bad behavior of input window
2014-08-14 15:19:19 +09:00
ebd94bf07a
fixed: unwanted input window on OSX
2014-08-15 03:52:22 +09:00
bef17f2af7
fixed: modifier key bug
2014-08-14 15:21:53 +09:00
e2370f6f2d
fixed: inline backspace bug
2014-08-14 15:20:58 +09:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
8dee70dfbb
MAINT-2980 Fix for AMD cards reporting system ram + vram for dedicated vram -- use WMI instead of DxDiag to get dedicated video memory.
2014-06-30 19:54:28 -05:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
592b7e2fdf
MAINT-4009: Correcting a pointer deletion that should have correctly been an array deletion.
2014-04-24 00:35:14 +01:00
90d7e9ba8c
merge changes for STORM-2023
2014-04-22 15:59:28 -04:00
1173dde898
Remove calls to now unused methods
2014-04-18 21:05:20 +00:00
b533844945
STORM-2023: Restore system color picker on OSX
2014-04-18 20:06:39 +00:00
60795c508e
OPEN-215: Replace deprecated call to kCGLRPTextureMemory with kCGLRPTextureMemoryMegabytes
2014-04-14 23:08:50 +00:00
1108a34d1d
MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without any other key being pressed simultaneously.
2014-04-08 12:37:41 +03:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
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-13 20:36:05 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
02423199e8
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-03-11 17:42:02 -05:00
2ae011dc5c
MAINT-3786 FIXED When bringing focus back to the viewer with a single click
...
in world view, a double click teleport to clicked point happens under certain
circumstances
2014-03-11 19:22:11 +02:00
7835d48f6d
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-27 18:06:48 -06:00
a8e22e11c5
MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and 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-27 17:49:50 -06:00
Mnikolenko ProductEngine