simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
Brad Payne (Vir Linden)
|
5a436e46f6
|
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
|
2013-03-08 17:07:17 -05:00 |
|
Graham Madarasz (Graham)
|
2e8b2558b4
|
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
|
2013-03-07 14:13:14 -08:00 |
|
Graham Madarasz
|
eda81f68ca
|
For MAINT-1842 fix model validation to check for NaNs
|
2013-03-06 09:07:33 -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 |
|
Dave Parks
|
8039c4583e
|
MAINT-1567 cleanup some gcc warnings
|
2012-10-23 14:31:34 -05:00 |
|
Dave Parks
|
10697d59b6
|
MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.
Reviewed by VoidPointer
|
2012-10-23 13:35:11 -05:00 |
|
Dave Parks
|
ec125540c4
|
MAINT-643 Fix for incorrect lighting and colors in preview displays.
|
2012-10-16 16:25:01 -05:00 |
|
Dave Parks
|
9b7bfcf594
|
MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in model importer
|
2012-10-12 17:25:17 -05:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
Don Kjer
|
1f6e20c5bb
|
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
|
2012-09-04 17:43:08 +00:00 |
|
Oz Linden
|
8df3619621
|
merge to viewer-developmento
|
2012-07-24 10:51:37 -04:00 |
|
Todd Stinson
|
4feef5af63
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
|
2012-07-23 19:21:34 -07:00 |
|
prep
|
f71d1db58d
|
MAINT-1253 Rigged meshes in the upload model window now have a material applied instead of white.
|
2012-07-11 10:47:45 -04:00 |
|
Oz Linden
|
2c3e78f1f1
|
merge changes for DRTVWR-167
|
2012-06-27 14:18:22 -04:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
Oz Linden
|
d500379cea
|
PATH-735: Limit and clean up grid selection
|
2012-06-12 21:58:52 -04:00 |
|
Brad Payne (Vir Linden)
|
542975b4c6
|
merge
|
2012-06-04 16:19:18 -04: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
|
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 |
|
Jonathan Yap
|
dd5d7fadca
|
STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard
|
2012-05-18 12:12:42 -04:00 |
|
Brad Payne (Vir Linden)
|
635a264e6f
|
merge
|
2012-02-08 11:22:52 -05:00 |
|
Brad Payne (Vir Linden)
|
cd46f4a7b9
|
SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english language
|
2012-01-27 13:56:03 -05:00 |
|
Brad Payne (Vir Linden)
|
1435a8b9e6
|
SH-2789 WIP - stricter calling of memcpyNonAliased16
|
2012-01-04 15:21:23 -05:00 |
|
Dave Parks
|
5546041301
|
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
|
2011-12-21 15:55:14 -06:00 |
|
Oz Linden
|
f1a4593e47
|
merge changes for vmrg-204
|
2011-12-12 09:04:33 -05:00 |
|
Richard Linden
|
c191f523a9
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-11-30 17:57:09 -08:00 |
|
Dave Parks
|
85392acac0
|
merge
|
2011-11-29 14:43:09 -06:00 |
|
Richard Linden
|
d089e6c264
|
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
|
2011-11-28 19:16:49 -08:00 |
|
Oz Linden
|
b69be18d7b
|
merge changes for vmrg-193
|
2011-11-24 06:56:57 -05:00 |
|
Brad Payne (Vir Linden)
|
810a00469a
|
merge
|
2011-11-22 09:50:29 -05:00 |
|
Brad Payne (Vir Linden)
|
1dd24cfcf8
|
SH-2614 FIX, SH-2684 FIX - fixed buggy state management in onPhysicsUseLOD
|
2011-11-21 17:40:12 -05:00 |
|
Dave Parks
|
f19f43c746
|
merge
|
2011-10-19 16:21:18 -05:00 |
|
Brad Payne (Vir Linden)
|
4dd15ae27d
|
merge
|
2011-10-19 11:45:42 -04:00 |
|
Dave Parks
|
4924f0c99b
|
b782a75c99e6 backout cleanup
|
2011-10-14 12:38:48 -05:00 |
|
Dave Parks
|
7b6723d1e0
|
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
|
2011-10-13 01:19:45 -05:00 |
|
Dave Parks
|
cffcb414f5
|
SH-2488 Fix for shiny and alpha not interacting well on rigged attachments (and fix for assertion when rendering model import preview)
|
2011-10-07 17:44:57 -05:00 |
|
prep linden
|
93e3d9e2ec
|
Fix for sh-2483
|
2011-09-30 15:40:27 -04:00 |
|
prep
|
69ac0d0aee
|
Fix for sh-2500
|
2011-09-28 14:52:27 -04:00 |
|
Dave Parks
|
bd02cdc75f
|
merge
|
2011-09-26 19:27:10 -05:00 |
|
Brad Payne (Vir Linden)
|
f3f841bddf
|
SH-2425 FIX - customized upload permissions info for damballah/staging
|
2011-09-26 14:41:21 -04:00 |
|
Brad Payne (Vir Linden)
|
75b2f61789
|
merge
|
2011-09-22 14:45:04 -04:00 |
|
prep
|
812b6c60ed
|
Fix for sh-2467
|
2011-09-21 15:01:15 -04:00 |
|
Dave Parks
|
9ea41c8094
|
SH-2243 No deprecated calls for the whole session.
|
2011-09-20 00:54:37 -05:00 |
|
prep linden
|
3f0a2cda29
|
Fix for sh-2443
|
2011-09-19 11:00:11 -04:00 |
|
prep linden
|
1a7e166104
|
Fix for sh-2443
|
2011-09-16 15:10:58 -04:00 |
|
Dave Parks
|
7c95af74f1
|
SH-2243 work in progress -- application side matrix stack management
|
2011-09-14 16:30:45 -05:00 |
|
Brad Payne (Vir Linden)
|
4b269f67ea
|
merge
|
2011-09-14 14:54:20 -04:00 |
|
prep
|
df40eca093
|
merge
|
2011-09-14 10:41:52 -04:00 |
|
prep
|
4efca483d7
|
Fix for CTS-804. Added support for parsing translations from Blenders(v2.5.9) transform SID's.
|
2011-09-14 10:41:26 -04:00 |