6be2f0ba2b
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2014-11-14 08:49:08 -05:00
2c78c1935f
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:45:18 -07:00
5cb5c267ca
fixes for cmake warnings about policy changes. could not fully test these changes
2014-10-13 12:46:55 -07:00
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
c307bda68a
Correcting a build error with the release viewer.
2014-05-08 21:58:51 +01:00
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
24f8745914
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
969cb45920
merge
2014-02-11 16:04:31 -05:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
4acc2dc273
Merge viewer-release
2014-02-10 15:42:25 -08:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
3c2b90514d
merge 3.6.10-release
2013-11-11 16:19:35 -05:00
c35801ef1c
fixed focus issue on inventory
2013-11-05 19:26:23 -08:00
b95935ccf3
Merge downstream code from viewer-bear
2013-10-30 11:25:08 -07:00
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
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
cecad67163
merge
2013-10-16 17:56:48 -04:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
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
badb8a945d
NORSPEC-259 revive fix stomped with materials->bear merge
2013-09-26 09:23:47 -07:00
71e986b059
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
2013-09-23 14:49:10 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
63757692b6
NORSPEC-362 Fix leak of deferred color attachments
2013-09-11 20:40:11 -07:00
e6a68e1f09
merge
2013-09-10 15:30:13 -04:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e8bd9afbe6
Merge viewer-release 3.6.5 Cocoa
2013-09-09 13:10:45 -07:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07: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
a7aed07a5b
broke out llunit.h into llunittype.h and llunits.h for unit declarations
...
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07:00
a3b1a60ed7
merge
2013-08-22 16:12:40 -04:00
8675ed0491
Fix merge regressions from missed changes to LoD updates
2013-08-19 16:04:28 -07:00
1616b73ef3
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-19 16:12:07 -06:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
Nat Goodspeed