Tank_Master
|
718f6fa0ff
|
merge LL 3.6.1
|
2013-07-10 00:23:23 -07:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07:00 |
|
Graham Madarasz
|
a099815774
|
Merge vwr-dev-mat
|
2013-05-11 08:11:13 -07:00 |
|
Graham Madarasz
|
f2455ccaaf
|
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
|
2013-05-10 16:10:25 -07:00 |
|
Oz Linden
|
1b984d8f40
|
merge changes for 3.5.1-release
|
2013-05-08 14:46:00 -04:00 |
|
Graham Madarasz
|
806d09b114
|
Merge 3.5.1 into Materials
|
2013-04-30 19:50:05 -07:00 |
|
Graham Madarasz
|
03cfdeca7a
|
Fix ifdefs around asserts broken in release only by merge
|
2013-04-26 10:52:02 -07:00 |
|
Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Graham Madarasz
|
019c7566fb
|
For MAINT-1291 Code Review: DaveP
|
2013-02-07 09:18:09 -08:00 |
|
Nyx Linden
|
11fe124ae9
|
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
2013-01-24 16:22:49 -05:00 |
|
Don Kjer
|
30aea02e8e
|
Fix for release build in gcc 4.6
|
2012-10-11 01:00:31 +00:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
Don Kjer
|
19e43e4b58
|
Added fast timers for baked texture rendering. Updated appearance utility
|
2012-10-06 08:08:52 +00:00 |
|
Don Kjer
|
8c0aa31536
|
Adding optimization to skip alpha image analysis when it isn't needed.
|
2012-10-04 00:42:31 +00:00 |
|
Don Kjer
|
d3924200b6
|
Removing unused gHeadlessClient code from viewer
|
2012-09-23 03:06:11 +00:00 |
|
simon@Simon-PC.lindenlab.com
|
38acb45af8
|
Merge in latest viewer-development
|
2012-09-05 17:17:54 -07:00 |
|
Brad Payne (Vir Linden)
|
58d5e223b8
|
merge
|
2012-07-30 15:02:02 -04:00 |
|
Brad Payne (Vir Linden)
|
a5c9d89b28
|
merge
|
2012-07-30 14:57:33 -04:00 |
|
Xiaohong Bao
|
afcc61a07a
|
fix for SH-3238: Textures are loaded at lower detail on subsequent log-ins
|
2012-07-19 15:31:33 -06:00 |
|
Tank_Master
|
6207030884
|
Merge FS LGPL tip
|
2013-02-23 17:09:53 -08:00 |
|
Tank_Master
|
ea86bb88c3
|
first pass merge
|
2013-02-04 10:52:32 -08:00 |
|
Tank_Master
|
169263d8b0
|
Merge LL 3.4.5 beta 3
|
2013-01-28 01:56:00 -08:00 |
|
Tank_Master
|
5b5f4c8bf5
|
Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
|
2012-12-14 07:59:55 -08:00 |
|
Cinders
|
e76211216d
|
Fixed FIRE-8417. Also, support for aurora-sim regions with non power of two sizes
|
2012-12-04 20:46:22 -07:00 |
|
Tank_Master
|
93d4b47252
|
Merge LL 3.4.1 beta 10
|
2012-10-26 09:59:19 -07:00 |
|
Dave Parks
|
683c43c2e0
|
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
|
2012-09-20 10:00:55 -04:00 |
|
William Todd Stinson
|
a766e26db4
|
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
|
2012-09-10 10:37:02 -07:00 |
|
Dave Parks
|
bedbbf7c02
|
Merge
|
2012-06-28 16:32:54 -05:00 |
|
Dave Parks
|
ed72fd0ae9
|
merge
|
2012-06-28 13:22:04 -05:00 |
|
Brad Payne (Vir Linden)
|
74d4f8af01
|
v-r to drano merge conflicts wip
|
2012-06-26 16:43:58 -04:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
callum
|
2eedd0c3c0
|
Merge with tip
|
2012-06-15 13:00:49 -07:00 |
|
Dave Parks
|
b93a23aa82
|
MAINT-1147 Fix for frame stall on region crossing.
|
2012-06-13 18:05:56 -05:00 |
|
Nicky
|
034cbbdc95
|
User-defined names was deprecated with OpenGL 3.1. Just generate/delete using OpenGL function.
|
2012-09-26 21:00:25 +02:00 |
|
Dave Parks
|
e3a5125b41
|
MAINT-616 Potential fix for corrupted mip maps.
|
2012-05-25 17:58:12 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
1777fa5187
|
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
|
2012-05-25 15:07:22 -07:00 |
|
Dave Parks
|
efda0814cb
|
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
|
2012-05-24 10:50:48 -05:00 |
|
Dave Parks
|
534168c452
|
MAINT-616 Fix for crash on shutdown caused by previous changes.
|
2012-05-22 00:49:07 -05:00 |
|
Dave Parks
|
b7cfd8c7f0
|
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
|
2012-05-21 23:33:25 -05:00 |
|
Xiaohong Bao
|
da29210ed6
|
fix a sculpt crash
|
2012-05-01 21:29:19 -06:00 |
|
Xiaohong Bao
|
164de6c180
|
fix for a crash on sculpt
|
2012-04-27 18:32:42 -06:00 |
|
Brad Payne (Vir Linden)
|
7b3f721e7a
|
SH-3018 WIP - removed audit texture, other unused diagnostic code
|
2012-02-29 16:15:02 -05:00 |
|
Dave Parks
|
f53fa08c70
|
MAINT-708 Use texture compression to minimize memory bloat (experimental)
|
2012-03-02 13:35:10 -06:00 |
|
Dave Parks
|
dbef1616dc
|
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
|
2011-11-16 12:40:51 -06:00 |
|
Dave Parks
|
73d70b5d45
|
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
|
2011-11-15 12:19:05 -06:00 |
|
Dave Parks
|
fa5a0a90f4
|
SH-2240 Fix for core profile assertions when Debug GL enabled.
|
2011-11-03 15:00:40 -05:00 |
|
Dave Parks
|
872567c0c1
|
SH-2244 Fix for mac build?
|
2011-09-28 16:51:23 -05:00 |
|
Dave Parks
|
54ba56dbe9
|
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
|
2011-09-26 18:31:55 -05:00 |