Nicky
|
de2c9af677
|
Backout of c0f5f3933a72. That call is likely okay and the driver crash is due to some other reason way before that.
|
2013-08-26 22:16:42 +02:00 |
|
Nicky
|
3b0f5a01da
|
Don't let glBufferSubDataARB read/write beyond buffer boundaries.
|
2013-08-10 22:46:31 +02: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 |
|
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 |
|
Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Nicky
|
4d70926425
|
Performance; Remove FastTimers from Vertexbuffer (hot code path) found by Zwagoth (NACL) & me.
|
2013-04-24 01:15:29 +02:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Graham Madarasz
|
e40bcc4e16
|
NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes
|
2013-04-17 09:05:40 -07: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 |
|
Dave Parks
|
679a095aa0
|
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
|
2013-04-02 15:45:17 -05:00 |
|
Dave Parks
|
fc4869fb78
|
NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.
|
2013-03-29 16:13:36 -05:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Nicky
|
af17cbce9f
|
Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds.
|
2013-04-20 03:31:54 +02:00 |
|
Nicky
|
0d4ecdefa4
|
Protect VBOs against buffer overflows.
|
2013-03-25 16:19:47 +01: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 |
|
simon@Simon-PC.lindenlab.com
|
40e78a80cc
|
Pull and merge viewer-development
|
2012-12-04 14:31:15 -08: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 |
|
simon@Simon-PC.lindenlab.com
|
d6e3b0445a
|
Merge in viewer-development code and fix build
|
2012-10-15 14:23:29 -07: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 |
|
William Todd Stinson
|
c6a2ac0489
|
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
|
2012-09-20 19:43:54 -07:00 |
|
Nyx Linden
|
49caededb4
|
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
|
2012-09-19 17:05:56 +00: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 |
|
simon@Simon-PC.lindenlab.com
|
83f5d0c616
|
Merge in viewer-development
|
2012-07-31 15:42:02 -07:00 |
|
Oz Linden
|
509408f393
|
merge back beta fixes for DRTVWR-180
|
2012-07-14 09:30:09 -04: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
|
cc44316aed
|
Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
|
2012-12-18 00:36:35 -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 |
|
Tank_Master
|
9f4245779c
|
Partial Merge of LL 3.4.2 Release
|
2012-12-10 15:56:46 -08:00 |
|
Nicky
|
2b620b006b
|
Disable caching of vbo memory in LLVBOPool. Had been there once and it was a memory hog, now it's back and it's again keeping massive amounts of memory
|
2012-11-02 00:05:28 +01:00 |
|
simon@Simon-PC.lindenlab.com
|
56d563ba7f
|
Fix merge issues - duplicate insertions of code
|
2012-07-11 17:14:25 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
173d0fa213
|
Pull in viewer-development because it's painful. Merge with runitai's help.
|
2012-07-11 16:15:23 -07:00 |
|
Dave Parks
|
e86b1c18db
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
Dave Parks
|
997b360747
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
b7555a3309
|
Merge back viewer-lion, which has viewer-development and down-stream fixes
|
2012-08-01 14:07:24 -07:00 |
|
Dave Parks
|
4a5ad35793
|
MAINT-570 Remove unused memory tracking system LLMemType
|
2012-07-20 11:42:15 -05:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
Nicky
|
b43e29ee66
|
Reapplied after merge: Fix for GCC 4.6.3 when compiling 64 bit.
|
2012-06-10 23:13:50 +02:00 |
|
Nicky
|
c1e6caf23a
|
Backed out changeset 0cb6e34b68e5. Talked with Tonya, this needs a slightly different fix.
|
2012-10-14 22:02:33 +02:00 |
|
Tonya Souther
|
a88d1372ee
|
Pass the address of an array element to a function expecting a pointer.
|
2012-10-14 14:09:48 -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 |
|
Tank_Master
|
999bd2130e
|
Merge LL 3.4.0 release
|
2012-09-13 15:19:30 -07:00 |
|
Tank_Master
|
d9c7b9253d
|
merge LL 3.4.0 viewer-beta
|
2012-08-31 00:18:30 -07:00 |
|
Tank_Master
|
8cb09ca444
|
Merge to FS LGPL 29865
|
2012-08-30 15:45:02 -07:00 |
|
Tank_Master
|
cb24ec2e0d
|
merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
|
2012-07-16 21:59:14 -07:00 |
|
Aura Linden
|
0fd3ff972d
|
MAINT-1142 use VBO pooling on OSX
|
2012-06-04 12:15:08 -07:00 |
|
Nicky
|
e0b334c615
|
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
|
2012-07-21 14:18:10 +02:00 |