Xiaohong Bao
|
38c19f4e55
|
for SH-2242: fixes the assertion caused by gGL.diffuseColor4f when shadows is on.
|
2011-09-01 17:18:16 -06:00 |
|
Dave Parks
|
7ee10ae1de
|
SH-2242 Remove old multisample shaders and make FXAA turn itself off when FSAA is disabled.
|
2011-08-27 01:30:31 -05:00 |
|
Dave Parks
|
c8b8b153f1
|
SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).
|
2011-08-27 00:48:14 -05:00 |
|
Dave Parks
|
7821ff23ba
|
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
|
2011-08-27 00:38:53 -05:00 |
|
Leslie Linden
|
bf0d36bf88
|
Mac rendering now with 100% fewer crashes when enabling shadows.
|
2011-08-24 15:41:00 -07:00 |
|
Leslie Linden
|
11d7a7f197
|
Mac crash fixes.
Reviewed by davep.
|
2011-08-23 11:19:04 -07:00 |
|
Leslie Linden
|
764b7a1ec0
|
Mac build fixes.
|
2011-08-22 15:58:12 -07:00 |
|
Dave Parks
|
90ebaeef9b
|
merge
|
2011-08-21 16:23:50 -05:00 |
|
Dave Parks
|
ee4fdd2c18
|
SH-2242 Work in progress on FXAA/glVertexAttrib -- DoF works, physics shape display still doesn't.
|
2011-08-21 16:23:04 -05:00 |
|
Dave Parks
|
63c420d8dd
|
Merge
|
2011-08-20 15:33:57 -05:00 |
|
Oz Linden
|
e18e1375a0
|
merge changes for .v-r
|
2011-08-20 08:49:31 -04:00 |
|
Oz Linden
|
f34b579e53
|
merge back release tags
|
2011-08-20 08:48:51 -04:00 |
|
Oz Linden
|
958eaee399
|
merge back beta tags
|
2011-08-20 08:48:30 -04:00 |
|
Oz Linden
|
abfbd86598
|
merge changes for storm-1562
|
2011-08-20 07:16:01 -04:00 |
|
Oz Linden
|
dbc8d51cd0
|
merge changes for storm-1041
|
2011-08-20 07:15:41 -04:00 |
|
Oz Linden
|
574e24c34e
|
merge changes for storm-793
|
2011-08-20 07:15:20 -04:00 |
|
Oz Linden
|
86ae50784f
|
merge changes for storm-782
|
2011-08-20 07:14:54 -04:00 |
|
Oz Linden
|
50ea915256
|
merge changes for storm-1565
|
2011-08-20 06:34:17 -04:00 |
|
Dave Parks
|
233e42b331
|
merge
|
2011-08-19 16:34:34 -05:00 |
|
Oz Linden
|
fd2b0084bf
|
merge changes for storm-1563
|
2011-08-19 16:53:56 -04:00 |
|
Oz Linden
|
7ffc8b45e2
|
merge changes for storm-1564
|
2011-08-19 16:50:08 -04:00 |
|
Oz Linden
|
2b40cbb13d
|
correct coding policy problems
|
2011-08-19 16:47:48 -04:00 |
|
Dave Parks
|
0e496309d6
|
merge
|
2011-08-19 15:00:48 -05:00 |
|
Xiaohong Bao
|
428c762a3e
|
fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429
|
2011-08-19 13:27:51 -06:00 |
|
Debi King (Dessie)
|
7768d7e3fe
|
Added tag DRTVWR-81_3.0.1-beta1, 3.0.1-beta1 for changeset 364fd63517fb
|
2011-08-19 15:20:38 -04:00 |
|
Richard Linden
|
e15c97404f
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-08-19 11:27:03 -07:00 |
|
eli
|
5eefd0d66d
|
WIP INTL-46 Update translation for Traditional Chinese
|
2011-08-18 16:22:53 -07:00 |
|
Xiaohong Bao
|
24a0ec9286
|
fix for SH-2315: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138
|
2011-08-18 17:12:35 -06:00 |
|
Richard Nelson
|
cc4e708848
|
merge
|
2011-08-18 14:16:06 -07:00 |
|
Richard Nelson
|
64e3907853
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-08-18 14:05:27 -07:00 |
|
Richard Nelson
|
ff46a6f423
|
EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings
|
2011-08-18 13:59:38 -07:00 |
|
Debi King (Dessie)
|
b73291e9bd
|
merged .hgtags
|
2011-08-18 14:48:59 -04:00 |
|
Debi King (Dessie)
|
ba1589d118
|
merged .hgtags
|
2011-08-18 14:46:32 -04:00 |
|
Debi King (Dessie)
|
d36a9a7907
|
Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bf
|
2011-08-18 14:44:09 -04:00 |
|
Richard Nelson
|
e83cb4e959
|
Automated merge with bundle:D:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.uw1uld\ssh__richard@hg.lindenlab.com_richard_viewer-experience_njk05b.hg
|
2011-08-18 09:49:04 -07:00 |
|
Oz Linden
|
f40d2c5afb
|
take the newlines off of the language.txt files
|
2011-08-17 23:07:14 -04:00 |
|
Xiaohong Bao
|
fe46a8e012
|
fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890
|
2011-08-17 18:12:25 -06:00 |
|
Xiaohong Bao
|
c3327eba03
|
fix for SH-1069: [REGRESSION] Sometimes bumpmaps load only partially
|
2011-08-17 15:33:18 -06:00 |
|
Xiaohong Bao
|
dfcc084949
|
fix for SH-1142: HUD objects do not display bumpmaps when Lighting and Shadows are enabled.
|
2011-08-17 15:16:02 -06:00 |
|
Oz Linden
|
25e2d384b0
|
storm-1562: disable multi-threaded curl to prevent crash
|
2011-08-17 16:11:37 -04:00 |
|
callum
|
a666878a01
|
EXP-700 (VWR-24502) - added Satomi Ahn's name to list of contributors
|
2011-08-17 12:11:58 -07:00 |
|
Oz Linden
|
7e5be23686
|
add proper license headers to files that did not have them
|
2011-08-17 14:43:39 -04:00 |
|
callum
|
db92a8cbea
|
EXP-700 FIX SLPlugin(s) takes high CPU%
Reviewed by Richard.
|
2011-08-17 11:09:00 -07:00 |
|
Richard Nelson
|
20a1f0be0b
|
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
|
2011-08-17 10:38:21 -07:00 |
|
Oz Linden
|
bf4abf7f4f
|
add proper copyright and license headers
|
2011-08-17 13:29:30 -04:00 |
|
Oz Linden
|
43fd5ef807
|
fix files that do not end with a newline (warn-on-failure:copyright because some have both problems...)
|
2011-08-17 12:42:37 -04:00 |
|
Oz Linden
|
f0bc8a0f71
|
convert tabs to spaces where they are forbidden
|
2011-08-17 12:33:23 -04:00 |
|
Oz Linden
|
f368c858cd
|
correct line endings
|
2011-08-17 12:09:59 -04:00 |
|
Oz Linden
|
b2ef0f9988
|
merge changes for storm-1546
|
2011-08-17 11:32:27 -04:00 |
|
Oz Linden
|
ff2eb602a0
|
merge changes for storm-1560
|
2011-08-17 11:31:06 -04:00 |