749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
0e496309d6
merge
2011-08-19 15:00:48 -05:00
428c762a3e
fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429
2011-08-19 13:27:51 -06:00
fe46a8e012
fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890
2011-08-17 18:12:25 -06:00
91ac6b16f5
merge changes for VWR-25588
2011-08-15 09:43:38 -04:00
f302e11962
merge
2011-08-08 15:33:55 -05:00
f42df4cd9f
merge changes for storm-1538
2011-08-04 15:39:33 -04:00
8ec39da346
SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
...
Reviewed by Leslie
2011-07-29 17:46:16 -05:00
6b3a7480a1
merge
2011-07-26 15:47:53 -07:00
fd9f3b9fe9
EXP-1021 FIX Position of web content browser dictates position of profile panel - profile panel position changes do not persist
...
EXP-1030 FIX Search button toggle can get out of synch in bottom bar
made llinstancetracker::iterator do own nested level management (removing need for separate guard)
added support for filename= to floaters
can pass in arbitrary window_class to floaters
2011-07-26 14:26:27 -07:00
c07f55e605
merging latest viewer-development to mesh merge candidate.
2011-07-25 18:26:14 -04:00
5774bac296
merged VWR-25588 fix (hovertext occlusion)
2011-07-21 11:02:30 +02:00
1a1a4beb52
FIRE-543/VWR-25588: made in-code comment a bit clearer
2011-07-21 10:54:22 +02:00
912e99906b
Credit Zi: FIRE-543 change fixes SH-489 and VWR-24017 and therefore also VWR-25588
...
It looks like the parent changeset (86eec7b46566; transplanted from
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/7af0278beaef )
fixes the following issues:
* SH-489 (object hover text not occluded)
* VWR-24017 (nametag / bubblechat not occluded)
* VWR-25588 (union of the above two symptopms)
Thus list them all under Zi's entry in doc/contributions.txt.
Also removed her name from the in-code comment, to adhere to our CS.
2011-07-21 10:49:19 +02:00
26568d5c98
SH-1838 Add error handling for allocation of off screen render targets.
...
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
190ff3c346
SH-2031 Fix for link error in llui_libtest
2011-07-18 10:39:02 -05:00
535f718736
Proposed fix for FIRE-543 - Hovertext renders as overlay on top of everything else
...
(transplanted from 7af0278beaefa4fb1eb9a41f4e9317ac5fe37690)
2011-07-17 17:26:40 +02:00
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
f587af0af1
Build fix for Mac OS X.
2011-07-11 15:16:56 -07:00
9db49b4448
SH-2038 Disable usage of stream vbo on mac and make flexi's use stream vbo if stream vbo disabled (effectively disables usage of vertex buffers for flexible objects on mac)
2011-07-11 12:14:06 -05:00
b5149a63f9
SH-2038 Compatibility fix for mac build (GL_ARB_sync symbols not defined on OSX)
2011-07-11 11:41:34 -05:00
268f3dbdea
SH-2038 Fix for some compiler errors from the apple tweaks -- also add a fence API (disabled for now).
2011-07-10 02:29:39 -05: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
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
36a05ebd9a
SH-1951 Partial fix for basic shaders disabled changing terrain appearance.
2011-07-05 17:25:57 -05:00
4bce553a96
merge viewer-development -> mesh-development
2011-07-01 09:41:10 -04:00
5e20cee4b4
SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1f
2011-06-27 10:34:21 -05:00
ad4b559f9f
SH-1903 Fix for silly shader compiler error.
2011-06-24 15:30:48 -05:00
253642ccff
SH-1903 Don't use indexed texture rendering when GL version is < 3.1 (fixes bad performance on cards with old drivers)
2011-06-23 23:06:36 -05:00
97ef8e0ea0
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-22 16:07:47 -06:00
2ac1fe03e8
SH-1838 Fix for black screen when enabling lighting and shadows on an ATI machine.
2011-06-21 16:11:04 -05:00
32f8b47497
debug code for SH-692: Viewer Crash when enabling Render Metadata > Physics Shapes on Mesh Sandbox 25 on Windows XP
2011-06-21 12:00:38 -06:00
b9b1500979
SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code.
2011-06-20 11:55:22 -05:00
44f0a1b681
SH-1778 Physics shape display fix up.
2011-06-11 16:51:01 -05:00
dd4e506101
Followup on mapbuffer work -- only use map buffer where map_buffer_range is available, and allow non-buffer-mapping implementation to take advantage of recorded mapped regions.
2011-06-10 01:28:53 -05:00
690f18c948
merge
2011-06-07 13:59:40 -05:00
70f959f01e
SH-1738 Fix for broken UI text when deferred rendering enabled.
2011-06-06 02:41:09 -05:00
ffab1eef57
Mac build fixes.
...
Reviewed by davep.
2011-06-03 16:24:07 -07:00
960e8c05cb
Automated merge with http://hg.secondlife.com/viewer-development
2011-06-02 13:35:15 -07:00
d4e09e81ca
Linux build fix.
...
Unused local varible removed.
2011-06-02 17:03:51 +03: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
ece32418e7
SH-1682 Dynamically adjust the number of texture channels to use for indexed texture rendering based on available hardware.
2011-05-31 14:35:59 -05:00
eca17c8993
SH-1682 Full integration if indexed texture rendering to improve batch size.
2011-05-30 01:25:55 -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
2595d53ded
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-25 18:14:55 -07:00
a8405dea54
EXP-829 FIX Text Box Alignment bug
...
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable
fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms
reviewed by Callum
2011-05-25 18:10:58 -07:00
3a2c3a45aa
Remove unused variable.
2011-05-25 19:23:41 -05:00
9eea451a82
SH-469 Don't use depth buffers and multisample buffers where not absolutely needed -- make sample counts consistent between shaders and render targets.
2011-05-25 15:51:15 -05:00
Xiaohong Bao