Dave Parks
|
465809711e
|
MAINT-2968 Transplant cleanup.
|
2013-10-11 17:10:26 -05:00 |
|
Dave Parks
|
e43058e764
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
maksymsproductengine
|
63cc379c72
|
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
|
2013-10-04 02:50:50 +03:00 |
|
callum_linden
|
bd41392b7e
|
Merge with viewer-bear which was just merged with viewer-release
|
2013-06-28 13:36:41 -07:00 |
|
callum_linden
|
b6b4b59138
|
Merge with viewer-release
|
2013-06-27 18:03:47 -07:00 |
|
Dave Parks
|
4696eeeb30
|
Merge cleanup.
|
2013-06-21 17:07:37 -05:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
80552a465e
|
Only render bounding boxes for volumes in info display.
|
2013-06-21 12:19:07 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
Dave Parks
|
ccd04cd66c
|
Occlusion culling overhaul.
|
2013-06-18 17:24:21 -05:00 |
|
Graham Madarasz
|
88553c9eb1
|
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
|
2013-06-12 12:19:48 -07:00 |
|
Graham Madarasz
|
d2b253f1f6
|
Changes to protect against use of normalize3fast on degenerate vectors
|
2013-06-12 09:16:19 -07:00 |
|
Dave Parks
|
c3f14b915c
|
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
|
2013-06-03 12:50:48 -05:00 |
|
simon
|
5687b0c4df
|
Merge
|
2013-05-09 15:30:49 -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 |
|
Dave Parks
|
592586052c
|
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
|
2013-05-07 17:21:32 -05:00 |
|
Dave Parks
|
dbfcd6c9c5
|
Optimization -- don't draw glow in alpha pool unless needed
|
2013-05-07 17:20:33 -05:00 |
|
Graham Madarasz
|
1f5f0a4b06
|
Merge vwr-dev-mat
|
2013-05-07 12:42:32 -07:00 |
|
Dave Parks
|
18e3985120
|
NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.
|
2013-05-06 15:44:44 -05:00 |
|
Graham Madarasz
|
806d09b114
|
Merge 3.5.1 into Materials
|
2013-04-30 19:50:05 -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 |
|
Dave Parks
|
8025b8b2bc
|
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
|
2013-04-15 13:16:14 -05: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 |
|
Dave Parks
|
78d23e6642
|
NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water.
|
2013-04-10 00:27:32 -05:00 |
|
Oz Linden
|
2fde4a9ae5
|
merge changes for 3.5.0-beta7
|
2013-04-01 14:24:01 -04:00 |
|
Dave Parks
|
d81fde49f7
|
NORSPEC-64 Fix for batches breaking on every single face when materials are in play.
|
2013-03-29 12:02:53 -05:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
simon
|
d8dc74b833
|
MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. Reviewed by Kelly
|
2013-03-28 16:06:07 -07:00 |
|
simon
|
a976f5c217
|
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
|
2013-03-25 12:19:02 -07:00 |
|
Simon Linden
|
d5561a1ada
|
Merge in viewer-beta to get CHUI code
|
2013-03-19 16:20:53 -07:00 |
|
Dave Parks
|
08ae21f52d
|
MAINT-2410 Extra Particle Parameters -- viewer implementation
Reviewed by Kelly and Graham
|
2013-03-13 17:07:22 -05:00 |
|
prep
|
207d9fd767
|
Viewer-chui merge
|
2013-03-11 14:45:53 -04:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Merov Linden
|
faae38daaa
|
Pull merge from lindenlab/viewer-developement
|
2013-01-30 20:01:03 -08:00 |
|
Geenz
|
aa1befd689
|
Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry.
|
2013-01-30 12:17:04 -05:00 |
|
Dave Parks
|
4dfd99069f
|
MAINT-2288 Fix for physics shapes not showing up on "active" objects.
|
2013-01-29 16:10:58 -06: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 |
|
prep
|
e0432f98ee
|
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
|
2012-11-28 16:36:34 -05:00 |
|
William Todd Stinson
|
be0406bffd
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-10-31 10:52:54 -07:00 |
|
Oz Linden
|
1a872c7bf8
|
pull back changes from 3.4.1-beta11
|
2012-10-30 14:34:05 -04:00 |
|
William Todd Stinson
|
9da9b2d84b
|
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
|
2012-10-17 14:32:29 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
d6e3b0445a
|
Merge in viewer-development code and fix build
|
2012-10-15 14:23:29 -07:00 |
|
Dave Parks
|
cdbfdfc351
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Dave Parks
|
7ebbb5067d
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Oz Linden
|
1709952adb
|
pull back 3.4.1-beta6 fixes
|
2012-10-10 21:40:10 -04:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
William Todd Stinson
|
4a3bdb6896
|
Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.
|
2012-10-10 15:10:48 -07:00 |