e61da05739
merge with viewer-development
2011-10-05 13:01:29 -07:00
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
60d15f78e1
merge with latest mesh-dev
2011-07-26 15:51:44 -04:00
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
5267378577
fix for SH-1786: [PUBLIC] Turning off Lights and Shadows disables Glow
2011-07-15 17:01:25 -06:00
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
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
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
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
8f94ff85f9
merging up latest mesh-development to nyx-mesh-development
2011-05-17 12:13:54 -04:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
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
955b727550
merge
2011-03-21 17:56:11 -04:00
a4f2c570dd
update to latest viewer-development
2011-03-14 11:07:07 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
3f6208b176
Merge
2011-02-24 16:20:43 -07:00
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
9b50def44f
Automated merge up from viewer-development into mesh-development
2011-02-23 12:50:17 -05:00
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
24c353a1ad
first pass at clouding avatars that are too complex
2011-02-22 17:29:38 -05:00
f13884e528
partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-15 14:12:58 -07:00
a4135cd3aa
merge
2011-02-11 17:31:56 -05:00
01d219ed4c
removing particle disabling from performance testing so that I can test performance of particles
2011-02-01 17:26:23 -05:00
ee39db49a3
SH-831 Fix for local lights option not disabling local lights.
2011-02-01 03:13:47 -06:00
3c053b3fdb
SH-534 Fix for various bump map glitches.
2011-01-21 16:23:44 -06:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
433ad05ae9
merge up to latest viewer-development
2010-12-27 14:29:11 -05:00
e79bd15fe0
SH-68 WIP adding debug switch for performance testing
...
Adding functionality to a previously added debug switch. This will allow me
to have UI, etc turned off and thus not impact framerates when testing for
rendering features.
2010-12-20 18:14:44 -05:00
fdd5348f81
Remove unimplemented software updater option. Fix potential double start of updater service.
2010-12-20 11:34:06 -08:00
9a3f6c1e0c
change updater settings from check box to drop down menu; add choice of whether to install automatically as well as download automatically (not actually implemented yet).
2010-12-09 12:49:51 -08:00
efa42a6aab
merge up to viewer-development
2010-12-04 09:14:58 -05:00
98802a1ef9
Merge
2010-12-02 21:34:01 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
6802775bc4
Merge with viewer-development
2010-11-18 15:36:11 -08:00
098fa21c4f
Work on CHOP-135: Hooking up setting UpdaterServiceActive to functionality. Paired with Mani.
...
Toggling the setting now calls LLUpdaterService::startChecking() and LLUpdaterService::stopChecking(), which enable and disable the service.
2010-11-17 17:06:21 -08:00
d1c365e7b7
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
2010-11-05 16:45:18 -07:00
ab42f31608
SH-410 Opaque Water Project version 2.0
...
First implementation with UI changes.
2010-11-05 14:30:09 -04:00
6ab2e44e94
VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad.
2010-11-01 15:18:18 -07:00
b32cb5b1e4
Fix for assert in pipeline on startup.
2010-10-29 12:07:02 -05:00
ad181dcaac
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:03 -05:00
450c28e02b
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:03 -05:00
96187475d1
SH-157 Add "RenderLocalLights" to preferences and featuretable to replace old local lights on/off radio group.
2010-10-20 16:18:08 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
1259e05edc
SH-157 Make RenderShaderLightingMaxLevel automatically reload shaders.
2010-10-12 17:06:07 -05:00
635128f353
Added graphics preference setting for physics.
2010-08-26 11:44:08 -04: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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
dd15fb86c0
CTS-237 WIP performance testing to validate ARC algorithm
...
Another typo - was disabling the UI, whether the debug option was true or false
simple copy/paste error.
2010-09-03 14:51:22 -04:00
Richard Nelson