48b107ac97
Apparently the new standard is to NOT suffix ARB extension function pointers with ARB.
2010-12-03 02:37:14 -06: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
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
894dd833f7
Depth of Field whenever "Lighting and Shadows" is enabled and global-illumination is not (experimental).
2010-11-24 03:36:41 -06:00
f0a0831954
STORM-560 FIXED Implemented preference that allows users to select default behavior when pressing letter keys.
...
- Added check to LLViewerWindow::handleKey() that gives focus to nearby chat if "Pressing letter keys starts local chat" option is selected, key is not special (and no modifier key is held except Shift), camera is not in mouselook and no view currently has keyboard focus.
- The choice of what should happen when letter keys are pressed is saved in new setting added in this fix- "LetterKeysFocusChatBar".
2010-11-18 23:09:05 +02:00
d682394d02
merge
2010-11-11 11:23:10 -06:00
a942a64b89
merge fixes for STORM-546
2010-11-09 19:40:58 -05:00
cb54738a49
Merge from beta
2010-11-09 16:31:16 -05:00
dc59b268dc
SH-412 -- fix the way that redraws happen to eliminate flickering on resize -- patch from davep and seraph, I'm just applying it.
2010-11-09 15:18:41 -05:00
caa53cc8cd
merge up from v-d
2010-11-09 10:05:17 +00:00
bad6aa7f6b
Fix for manual merge errors.
2010-11-08 13:34:24 -05:00
543edbcdc0
Manual merge of llviewerwindow.cpp from mesh-development.
2010-11-08 13:09:15 -05:00
cd09b01906
Backout merge of llviewerwindow; need to do manual merge since this is messy.
...
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08 13:07:01 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
c98e6a99f9
Better locking of queues when displaying download queue status.
...
Reviewed by Nyx.
2010-11-02 16:32:29 -05:00
0347844b34
SH-358 FIXED Non-FBO driven fix for anti-aliasing (make applying of FSAA require restart when FBO is disabled).
2010-11-04 16:53:14 -04:00
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
e095665cca
SH-281 Fix for snapshots showing interface all the time
2010-11-01 12:30:54 -05:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
179e9e37ec
merge from viewer-development.
2010-10-27 11:03:39 +01:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
40e9566d98
Non-FBO driven fix for anti-aliasing (make applying of FSAA require restart when FBO is disabled).
2010-10-22 16:49:32 -05:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
ad033a4b35
sync up to viewer-developer
2010-10-15 09:52:11 +01: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
d65e512fa3
Automated merge up from viewer-development
2010-10-04 11:21:18 -04:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
0c93da0501
SH-224 Add new streaming cost algorithm debug displays to viewer.
...
Add the ability to clear LOD slots.
Make triangle count UI more responsive to Generate LOD button.
Add triangle count debug display for current selection.
Reviewed by Nyx
2010-09-29 16:09:21 -05:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
f3b01596dd
VWR-21377 Script editor ctrl-f fix.
...
change to better / more consistent naming
2010-09-24 16:31:43 -07:00
0931799f03
VWR-21377 Script editor ctrl-f fix.
...
let some LLViews handle shortcut keys if they want.
reviewed with ambroff
2010-09-24 15:57:17 -07:00
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07: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
1911993cc7
merge
2010-09-16 19:45:57 -07:00
fcdd09772f
debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23.
2010-09-16 13:13:06 -06:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
6c2c87e8b9
Merge
2010-09-09 17:19:33 -07:00
30f2987b0a
Backed out changeset: 28f52b3d2e3d
2010-09-09 17:17:44 -07:00
a0611b5a01
Automated merge with http://bitbucket.org/TheShining/viewer-development
2010-09-07 13:27:49 -06:00
497d35af48
fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) [secondlife-bin llimage.cpp]
2010-09-07 10:48:06 -06:00
b2eb877d52
vwr-20945 - make menu bar blue when using a project viewer
2010-09-03 17:37:17 -04:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
Dave Parks