Dave Parks
4f26a67c0f
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
Dave Parks
2e1067dd32
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
Liny
9eee943f83
Commenting out spammy debug line.
2012-05-07 22:57:24 -07:00
Tank_Master
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
Tank_Master
e07191cb7f
Backed out changeset: cab3e59e0834 (LL has a different fix for this)
2012-04-22 21:02:40 -07:00
Oz Linden
633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
Richard Linden
bbdb390624
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-02-08 19:55:28 -08:00
Richard Linden
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
Richard Linden
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
Leslie Linden
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
Brad Payne (Vir Linden)
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
Richard Linden
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
Richard Linden
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
Brad Payne (Vir Linden)
34408bed26
merge
2012-02-01 15:43:11 -05:00
Richard Linden
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
Richard Linden
22a6170a7b
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-27 19:55:16 -08:00
Tank_Master
ba95bbc8a3
MAINT-708 Add checkbox to hardware settings for controlling texture compression. (By DaveP)
...
Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
2012-03-08 23:13:29 -08:00
Dave Parks
7901085371
MAINT-708 Don't compress UI textures. Use GL_NICEST as compression hint to avoid artifacts.
2012-03-07 17:26:43 -06:00
Dave Parks
2cc39f35a0
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
Nicky
5741b71e89
FIRE-5077; remove hardcoded limit for max. 65535 (U16 max) for broader testing.
2012-02-27 00:43:07 +01:00
Richard Linden
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
Dave Parks
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
Leslie Linden
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
Dave Parks
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
Dave Parks
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
Nicky
f27eb236cc
Fix for old ATI drivers showing all textures pink.
2012-02-13 00:33:53 +01:00
Dave Parks
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
Richard Linden
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
Xiaohong Bao
80299bcd50
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-18 15:27:36 -07:00
Xiaohong Bao
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
Dave Parks
122691b836
merge
2012-01-18 12:41:40 -06:00
Dave Parks
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
Nicky
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
Nicky
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01:00
Nicky
70a35d5722
Don't use mFreeList in LLVertexBuffer. It only grows, never shrinks.
2012-01-27 21:03:37 +01:00
Xiaohong Bao
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
Brad Payne (Vir Linden)
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
Dave Parks
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
Alissa Sabre
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
Dave Parks
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
Dave Parks
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
Brad Payne (Vir Linden)
e907a2fba4
merge
2011-12-12 10:45:56 -05:00
Oz Linden
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
Dave Parks
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
Nicky
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
Alissa Sabre
6df5dfc0da
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
Richard Linden
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
Richard Linden
ff32ef773b
fix for crash on startup (font system not initialized when first creating fonts)
2011-11-29 23:53:28 -08:00
Dave Parks
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -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