Tank_Master
|
33922af1fa
|
Merge LL release
|
2013-11-01 19:52:14 -07:00 |
|
Tank_Master
|
5e2324b5d3
|
Backed out changeset: f632d5a3a4e3 - has unwanted side effects
|
2013-10-17 23:46:34 -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
|
ecbdb4948f
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
Tank_Master
|
52d9b07503
|
Merge viewer-bear
|
2013-09-12 21:15:34 -07:00 |
|
Tank_Master
|
831e4f443b
|
Merge LL 3.6.3 pass 1
|
2013-08-26 17:09:27 -07:00 |
|
Nicky
|
a12d3c4f95
|
Properly release OpenGL textures.
|
2013-08-18 00:06:11 +02:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
simon
|
b864cecd6c
|
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
|
2013-05-13 16:34:52 -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 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
simon
|
8895e79576
|
Merge downstream code / viewer-beta
|
2013-05-09 13:21:22 -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 |
|
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
simon
|
c7bab8ab8b
|
Merge
|
2013-04-11 16:04:21 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Dave Parks
|
609ed855e1
|
MAINT-2371 More optimizations.
Reviewed by Graham
|
2013-03-04 18:01:42 -06: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 |
|
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 |
|
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 |