633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
bbdb390624
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-02-08 19:55:28 -08:00
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
e854db0645
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
22a6170a7b
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-27 19:55:16 -08:00
bbc265a9d5
EXP-1846 FIX Text positioning issues in Floaters, Notifications, UI, and toasts with UI size smaller than 1
...
also, re-enabled floater_test_textbox.xml
2012-01-26 16:30:38 -08:00
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
0bbe8d73cb
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
2012-01-25 15:37:36 -06: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
655505d304
SH-2794 Fix for bad textures on some hardware when vbo mapping disabled (always use GL_STREAM_DRAW as the usage hint when mapping is disabled as geometry will be uploaded again and again)
2012-01-19 14:57:07 -06:00
3a597af700
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
fixed font metrics rounding error and made corrective adjustments in layout
2012-01-18 16:30:53 -08:00
80299bcd50
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-18 15:27:36 -07:00
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
122691b836
merge
2012-01-18 12:41:40 -06:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
e907a2fba4
merge
2011-12-12 10:45:56 -05:00
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
f9f247c5a6
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
2011-12-07 16:36:26 -06:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
ff32ef773b
fix for crash on startup (font system not initialized when first creating fonts)
2011-11-29 23:53:28 -08:00
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
06a2d4eb27
SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason.
2011-11-28 17:13:42 -08:00
5c690db63f
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18 15:04:26 -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
38853ffdda
merge
2011-11-16 12:41:15 -06:00
dbef1616dc
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
2011-11-16 12:40:51 -06:00
6343c769ce
SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
2011-11-16 10:00:41 -08:00
bbac7e9aec
SH-2681 Fix for shader compiler error on GLSL 1.30 and later
2011-11-15 13:01:23 -06:00
73d70b5d45
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
2011-11-15 12:19:05 -06:00
df546bfba9
SH-2666 Tweak depth of field optimizations based on resident feedback.
2011-11-10 16:12:50 -06:00
c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00
367d6212ae
SH-2652 Better DoF combine foo
2011-11-04 17:07:40 -05:00
e82c0561fa
SH-2652 Faster depth of field
2011-11-04 16:14:43 -05:00
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
Oz Linden