Oz Linden
|
6f3cf79a3a
|
merge changes for 3.7.24-release
|
2015-01-13 13:46:45 -05:00 |
|
Oz Linden
|
dab5acd972
|
merge changes for 3.7.22-release
|
2014-12-15 12:34:18 -05:00 |
|
callum_linden
|
23711c9275
|
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
|
2014-12-10 08:44:08 -08:00 |
|
Brad Payne (Vir Linden)
|
7e962d3798
|
merge
|
2014-12-08 13:01:44 -05:00 |
|
Brad Payne (Vir Linden)
|
fe5ff3e74a
|
merge
|
2014-12-01 16:21:52 -05:00 |
|
Oz Linden
|
0013a50353
|
merge changes for 3.7.21 release
|
2014-12-01 15:49:31 -05:00 |
|
Graham Linden
|
a882d7a02b
|
Fix for gpu_bench crash without parallels knock-on
|
2014-11-18 12:54:13 -08:00 |
|
Graham Linden
|
de2fe42a52
|
Attempt wider disable of using profile API when timer query is not present
|
2014-11-17 14:54:00 -08:00 |
|
Graham Linden
|
9eeb8344a6
|
Avoid using GL_ARB_timer_query functionality when not supported and protect against probably-not-NULL current bound shader pointer
|
2014-11-17 11:40:28 -08:00 |
|
Nat Goodspeed
|
6be2f0ba2b
|
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
|
2014-11-14 08:49:08 -05:00 |
|
maksymsproductengine
|
fa9097b65f
|
Merge changes for 3.7.20-release
|
2014-11-11 02:32:39 +02:00 |
|
Oz Linden
|
b66c719060
|
merge changes for 3.7.20-release
|
2014-11-10 14:43:05 -05:00 |
|
callum_linden
|
2c78c1935f
|
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
|
2014-10-17 15:45:18 -07:00 |
|
Oz Linden
|
7ffa456683
|
STORM-2080: correct fitted mesh rendering on some ATI cards
|
2014-10-14 11:22:39 -04:00 |
|
JJ Linden
|
5cb5c267ca
|
fixes for cmake warnings about policy changes. could not fully test these changes
|
2014-10-13 12:46:55 -07:00 |
|
ruslantproductengine
|
d47efdfe03
|
MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization
|
2014-09-10 21:08:08 +03:00 |
|
Dave Parks
|
d0428575fb
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2014-06-19 13:14:42 -05:00 |
|
Stinson Linden
|
8392fde6f6
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
|
2014-06-02 22:32:16 +01:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Stinson Linden
|
c307bda68a
|
Correcting a build error with the release viewer.
|
2014-05-08 21:58:51 +01:00 |
|
Stinson Linden
|
f43e46bc9c
|
MAINT-4009: Ensuring that the pick mask for the LLImageGL is always properly freed during its cleanup method.
|
2014-04-28 19:44:02 +01:00 |
|
Dave Parks
|
24f8745914
|
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
|
2014-03-19 17:57:00 -05:00 |
|
Brad Payne (Vir Linden)
|
d9e3a2948a
|
merge
|
2014-03-12 17:24:07 -04:00 |
|
Richard Linden
|
5b846ed2a6
|
merge with release
|
2014-03-12 12:48:43 -07:00 |
|
Richard Linden
|
5866bb7ef0
|
merge with release
|
2014-02-12 10:32:02 -08:00 |
|
Brad Payne (Vir Linden)
|
969cb45920
|
merge
|
2014-02-11 16:04:31 -05:00 |
|
simon
|
38915f119c
|
More memory cleanup of containers after DeletePairedPointer() usage.
|
2014-02-14 14:57:08 -08:00 |
|
simon
|
4acc2dc273
|
Merge viewer-release
|
2014-02-10 15:42:25 -08:00 |
|
Brad Payne (Vir Linden)
|
744cf6be8d
|
merge
|
2013-12-05 10:39:35 -05:00 |
|
Richard Linden
|
17e9c872ad
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-11-11 19:17:49 -08:00 |
|
Oz Linden
|
3c2b90514d
|
merge 3.6.10-release
|
2013-11-11 16:19:35 -05:00 |
|
Richard Linden
|
c35801ef1c
|
fixed focus issue on inventory
|
2013-11-05 19:26:23 -08:00 |
|
simon
|
b95935ccf3
|
Merge downstream code from viewer-bear
|
2013-10-30 11:25:08 -07:00 |
|
Mnikolenko ProductEngine
|
dfa6822b34
|
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
|
2013-10-30 14:26:11 +02:00 |
|
Xiaohong Bao
|
0c60e32808
|
Merge
|
2013-10-21 16:57:38 -06:00 |
|
Brad Payne (Vir Linden)
|
cecad67163
|
merge
|
2013-10-16 17:56:48 -04:00 |
|
Brad Payne (Vir Linden)
|
1f8b37e9ad
|
merge
|
2013-10-16 11:52:43 -04:00 |
|
Richard Linden
|
697d2e720b
|
renamed TimeBlock to BlockTimerStatHandle
|
2013-10-15 20:24:42 -07:00 |
|
Richard Linden
|
1acceb3633
|
changed ll_aligned_(malloc|free) to take alignment size as a template argument
|
2013-10-14 10:18:41 -07:00 |
|
Dave Parks
|
0e116741a0
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
Dave Parks
|
ff8b002c3b
|
Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
|
2013-10-10 13:56:06 -05:00 |
|
Richard Linden
|
80dfbbaacd
|
merge from viewer-release
|
2013-10-08 11:59:24 -07:00 |
|
Richard Linden
|
17df8988fe
|
renamed TraceType to StatType
added more MemTrackable types
optimized memory usage of LLTrace some more
|
2013-10-07 13:38:03 -07:00 |
|
Richard Linden
|
754e8752a9
|
added initial memory usage tracking for lltrace
|
2013-10-03 14:30:34 -07:00 |
|
Richard Linden
|
59628d6f85
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-10-01 14:28:39 -07:00 |
|
Richard Linden
|
12f0f8cb72
|
changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
|
2013-10-01 13:46:43 -07:00 |
|
Graham Linden
|
badb8a945d
|
NORSPEC-259 revive fix stomped with materials->bear merge
|
2013-09-26 09:23:47 -07:00 |
|
Graham Linden
|
71e986b059
|
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
|
2013-09-23 14:49:10 -07:00 |
|
Graham Linden
|
95e34d86b9
|
The unbearable lightness of being norspec
|
2013-09-18 18:24:16 -07:00 |
|
Graham Linden
|
63757692b6
|
NORSPEC-362 Fix leak of deferred color attachments
|
2013-09-11 20:40:11 -07:00 |