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
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
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -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
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
c337888553
SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls.
2011-07-22 01:07:48 -05:00
76249c58f6
SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
...
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card
* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode
Reviewed by davep
2011-07-19 13:31:32 -07:00
e4d0d62e71
Added support for apple flush buffer range
2011-07-09 22:30:30 -07:00
f1443579b3
SH-2038 Potential fix for a myriad of performance problems concering VBO usage.
2011-07-09 02:28:34 -05:00
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
1fd46831f0
SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far)
2011-05-29 00:40:57 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
b98a17c825
SH-1443 Fix for fullbright alpha objects not appearing for some combinations of deferred rendering and non deferred automatic alpha mask toggling.
2011-04-28 16:40:06 -05:00
bf3fb25663
SH-1069 Fix for bump maps not loading fully -- don't clear bump image list on toggling deferred rendering, but do make sure a loaded callback exists when bump resolution or desired number of components is lacking. Also, subtract radius of prim from distance to face for virtual size calculations (makes heavily tiled textures on largish spheres fully res when appropriate).
2011-03-21 10:51:28 -05:00
00c861f967
SH-1085 Fix for crash when disabling "mirror" and a face is selected.
2011-03-08 14:14:33 -06:00
162d467b4a
SH-1085 Fix for crash when unchecking "mirror." Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members.
...
Reviewed by Nyx.
2011-03-03 16:14:52 -06:00
5bd5d918ca
merge
2011-02-02 19:03:03 -06:00
bb113f75ef
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
2011-02-02 19:01:27 -06:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
892d70f5d5
Prune ll_aligned_malloc/free calls out of lldrawable and llface
2010-11-21 03:48:11 -06:00
e8a92e6910
Fix for sometimes missing the color value on last vertex of a face.
2010-10-29 12:06:45 -05:00
94c2e4c0ae
Fix for NAN getting copied for some color values (NAN is purple).
2010-10-28 17:40:28 -05:00
3c8d6bfe0d
Don't mask HUD attachments also in non-deferred mode or they will be affected by daylight; Fix from Henri Beauchamp
2011-11-08 00:11:24 +01:00
4455fdc6a2
Do not put pointers into the LLColor4U union. That messes everything up when compiling under 64 Bit
2011-09-12 21:51:02 +02:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
393c819477
VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
...
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
b7cf948a82
SH-213 Fix for crash when selecting face.
2010-09-24 13:39:15 -05:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
c42ed54b0a
Stop using ll_aligned_malloc/free in llvolume.
...
Fix for garbage data in vertex weight array crashing software skinning.
Proper integration of picking for rigged attachhments.
Optimization in LLDrawable::updateDistance (don't call updateRelativeXform, just use spatial group position).
2010-09-20 18:45:56 -05:00
90da6d6fdc
Raycasting for rigged attachments now works for your own attachments while in edit mode.
2010-09-19 23:07:15 -05:00
7399c39a2f
Fix for crash when loading models (Don't hit UI from the main thread). Added asserts to LLFastTimer to verify main thread use only.
2010-09-02 19:13:48 -05:00
1c286f6b0b
Merge cleanup.
2010-08-31 18:10:02 -05:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
838c01e87d
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
2010-08-26 14:34:50 -04:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
b2b670d787
VWR-20752 (SNOW-586) Align planar-mapped textures across different faces.
...
Port of svn changset 3458 from Snowglobe, with minor tweaks.
2010-08-21 01:41:27 +03:00
834f2fa6a5
merge from viewer-release
2010-08-20 12:16:46 -07:00
bb8919c013
merge from viewer-release
2010-08-20 12:16:46 -07:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
Nicky