Dave Parks
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
Oz Linden
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
Oz Linden
f64a79d9d1
merge changes for DRTVWR-171
2012-06-21 14:19:25 -04:00
Todd Stinson
b8bc62a514
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-05-25 18:45:27 -07:00
Dave Parks
abaf0155b4
MAINT-616 Faster issuance of occlusion queries.
2012-05-25 10:51:38 -05:00
Todd Stinson
9b27e32a8d
Removing unused setting that is blocking my path to commit the subsequent change.
2012-05-24 16:07:31 -07:00
Oz Linden
7637acf76e
merge changes for DRTVWR-149
2012-05-22 06:03:42 -04:00
Kitty Barnett
1300f77fdd
Merged with viewer-beta
2012-05-20 17:41:00 +02:00
Jonathan Goodman
c7106a02b9
Merging latest changes for normalized blinn-phong.
2012-03-26 13:44:28 -04:00
Brad Payne (Vir Linden)
7b3f721e7a
SH-3018 WIP - removed audit texture, other unused diagnostic code
2012-02-29 16:15:02 -05:00
Kitty Barnett
2587f6d9d8
Minor fix for GCC
2012-03-29 18:25:48 +02:00
Kitty Barnett
9c66ac87fd
STORM-276 Basic spellchecking framework
2012-01-20 18:06:32 +01:00
Leslie Linden
619cda179d
SH-2711 FIX -- Removed the "RenderAnimateTrees" setting and associated code.
2011-11-23 13:18:41 -08:00
Dave Parks
db7924681d
SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al)
2011-11-08 17:46:43 -06:00
Dave Parks
a6e40e6e02
SH-2652 Slightly slower DoF (quality), apply FXAA *after* DoF, fix for some render targets not getting allocated when needed.
2011-11-07 12:34:05 -06:00
Dave Parks
7fef84ca75
SH-2571 Make low detail terrain stick when choosing "low" from preferences.
2011-10-19 18:06:32 -05:00
Dave Parks
f19f43c746
merge
2011-10-19 16:21:18 -05:00
Dave Parks
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
Richard Nelson
e61da05739
merge with viewer-development
2011-10-05 13:01:29 -07:00
Dave Parks
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
Dave Parks
eadb745c59
SH-2465 Move FXAA to its own pass independent of DoF (also removes the need to reload shaders when toggling FSAA on and off)
2011-09-29 23:03:20 -05:00
Dave Parks
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
Dave Parks
348a701812
SH-2507 Shave some unused/redundant varying state and make the max texture index debug setting rebuild shaders to use no flow control when set to 1 or lower
2011-09-28 00:41:10 -05:00
Dave Parks
bd02cdc75f
merge
2011-09-26 19:27:10 -05:00
Dave Parks
57620a9da9
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
2011-09-23 17:59:05 -05:00
Paul ProductEngine
5baf0de6a3
EXP-1203 FIXED (As a FUI user, I want the address bar and favorites to be on one line)
...
- Relocated address bar, combined with favorite landmarks EXP-1208
- Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217
- Modified Favorites ->> More spillover EXP-1218
- Combined context menu menuitems for favorites & address bars EXP-1219
2011-09-19 19:13:39 +03:00
Nyx (Neal Orman)
60d15f78e1
merge with latest mesh-dev
2011-07-26 15:51:44 -04:00
Dave Parks
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
Xiaohong Bao
5267378577
fix for SH-1786: [PUBLIC] Turning off Lights and Shadows disables Glow
2011-07-15 17:01:25 -06:00
Aaron Stone
42daa3497b
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12 15:48:02 -07:00
Dave Parks
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
Dave Parks
53e890f4fd
SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26 20:37:15 -05:00
Dave Parks
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
Nyx (Neal Orman)
8f94ff85f9
merging up latest mesh-development to nyx-mesh-development
2011-05-17 12:13:54 -04:00
Dave Parks
a25f898703
merge
2011-05-02 14:52:12 -05:00
Paul ProductEngine
c4f03ca949
STORM-595 FIXED (The presentation of IM sessions in message well depends on method that was used for opening IM window)
...
- Added the callback with the timer on control name "ThrottleBandwidthKBPS" changes. Now message is sending to the simulator in 0.3 sec after LAST variable change.
2011-04-08 19:21:21 +03:00
Nyx (Neal Orman)
955b727550
merge
2011-03-21 17:56:11 -04:00
Oz Linden
a4f2c570dd
update to latest viewer-development
2011-03-14 11:07:07 -04:00
Loren Shih
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
Xiaohong Bao
3f6208b176
Merge
2011-02-24 16:20:43 -07:00
Loren Shih
3d77dd6b58
Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.
2011-02-23 16:24:47 -05:00
Loren Shih
9b50def44f
Automated merge up from viewer-development into mesh-development
2011-02-23 12:50:17 -05:00
Dave Parks
e55e91a5a5
SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion queries if GL is set to not use VBOs for stream draw.
2011-02-22 18:36:50 -06:00
Nyx (Neal Orman)
24c353a1ad
first pass at clouding avatars that are too complex
2011-02-22 17:29:38 -05:00
Xiaohong Bao
f13884e528
partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-15 14:12:58 -07:00
Nyx (Neal Orman)
a4135cd3aa
merge
2011-02-11 17:31:56 -05:00
Nyx (Neal Orman)
01d219ed4c
removing particle disabling from performance testing so that I can test performance of particles
2011-02-01 17:26:23 -05:00
Dave Parks
ee39db49a3
SH-831 Fix for local lights option not disabling local lights.
2011-02-01 03:13:47 -06:00
Dave Parks
3c053b3fdb
SH-534 Fix for various bump map glitches.
2011-01-21 16:23:44 -06:00
Loren Shih
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00