d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
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
6bfe9a8686
Protect VBOs against buffer overflows: Need to set striders to their correct size.
2013-03-26 23:00:35 +01:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
9f4245779c
Partial Merge of LL 3.4.2 Release
2012-12-10 15:56:46 -08:00
d1c056beba
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
2012-07-03 14:35:08 -05:00
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
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
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
cb2e785f61
FIRE-5577; Avoid matrix modes overflow. A bit hackerish, but still better than crashing.
2012-05-29 01:39:58 +02:00
9eee943f83
Commenting out spammy debug line.
2012-05-07 22:57:24 -07:00
7b3f721e7a
SH-3018 WIP - removed audit texture, other unused diagnostic code
2012-02-29 16:15:02 -05:00
1de63bec50
MAINT-861 Fix for crash on exit due to bad matrix mode
2012-04-13 15:47:44 -05:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
e02f007d20
SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights.
2012-01-24 12:59:18 -06:00
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
b2824aa21d
SH-2690 Add comments per Vir's review feedback
2011-11-16 15:25:09 -06:00
986dccbeaf
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
2011-11-16 15:08:17 -06:00
969aa248a4
SH-2633 Fix for avatar hair turning white when editing appearance
2011-10-28 16:26:20 -05:00
3211c6e308
SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state
2011-10-11 00:26:03 -05:00
055a881084
SH-2031 fix for mac/linux build
2011-10-07 12:48:26 -05:00
79912f9d3f
SH-2031 Profile guided optimization of matrix ops
...
- don't use F64 except where needed (should really factor out calls to gluProject)
- get rid of sorting by texture in favor of sorting by matrix (no sort needed, geometry is already matrix sorted as a result of frustum cull tree traversal order)
- unroll matrix sync inner loop and cache MVP and normal matrices
2011-10-07 03:12:11 -05:00
40fe25632c
SH-2553 Fix for glitches when rendering HUD attachments.
2011-10-06 15:00:14 -05:00
7238714634
SH-2507 Potential fix for basic shaders causing objects to disappear with some drivers (prune shader tree of unused shaders while we're at it)
2011-09-29 19:32:56 -05:00
56191701bc
SH-2244 Fix for crash when enabling core profile on AMD GPUs
2011-09-25 02:43:43 -05:00
f674418251
SH-2244 Fix for UI blanking out on shader reload (stale matrix hash cleanup)
2011-09-25 00:20:12 -05:00
102f600d3a
SH-2244 Fix for bump surfaces appearing black when L&S disabled
2011-09-24 22:56:33 -05:00
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -05:00
a2d08a6d80
SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors.
2011-09-22 00:10:57 -05:00
66acb932ba
SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context.
2011-09-20 03:34:09 -05:00
4f99ace069
SH-2243 work in progress -- put back ambient lighting when atmospheric shaders disabled.
2011-09-17 00:19:19 -05:00
4fea7dcb3e
SH-2243 work in progress -- use a hash check to avoid redundantly setting light state
2011-09-15 17:10:33 -05:00
24ae2fb5af
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
2011-09-15 16:38:31 -05:00
530981a214
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
2011-09-15 00:54:25 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
7821ff23ba
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
2011-08-27 00:38:53 -05:00
ee4fdd2c18
SH-2242 Work in progress on FXAA/glVertexAttrib -- DoF works, physics shape display still doesn't.
2011-08-21 16:23:04 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
Tank_Master