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
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -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
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
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
cb2045fcd5
Merge downstream code with viewer-release
2014-02-10 16:11:50 -08:00
52ce788d0c
Pull in viewer-lion to lock down next release
2014-02-18 16:41:21 -08:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
ddd6b8f91b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:12:26 -08:00
522a4d02e3
MAINT-3506 FIXED Allocate appropriate amount of memory for temp variable.
2013-12-03 14:37:55 +02:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
d1b4c5bf73
merge changes for 3.6.10-release
2013-11-11 16:40:22 -05:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
976ad95977
Shot in the dark patch for MAINT-3353 backported from viewer-tiger
2013-11-05 13:01:25 -08:00
07b5e702e6
BUG-3968: do not wear an object when renaming in inventory
2013-10-29 13:59:21 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
4bc9393240
MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling
2013-09-26 18:53:12 -07:00
932882da22
Merge with bitbucket.org/msavchenko/viewer-release-maint-3132
2013-09-19 01:17:12 +03:00
33e70236f0
MAINT-3161 : Clean up avatar muting code and prototype feature
2013-09-17 17:01:52 -07:00
9b99ece5ab
MAINT-3135 WIP partial fix, addresses graphics corruption on resize, but not mouse mapping issues
2013-09-12 13:17:43 -07:00
6a9d23b71a
merge changes for open-189
2013-09-12 14:07:12 -04:00
0142a0c6a9
OPEN-189 Add missing header guard
2013-09-11 19:02:36 -04:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
callum_linden