Commit Graph

579 Commits (e4819d9b22deebf080ca262a5a110a0ddfaee672)

Author SHA1 Message Date
Loren Shih 8ccf3fbe3b Automated merge up from viewer-development into mesh-development 2011-03-31 16:40:57 -04:00
Dave Parks 6b9a2d24cc SH-477 Better mesh streaming cost estimation. 2011-03-30 18:38:22 -05:00
Oz Linden b595bbcf2a merge changes for storm-1019 2011-03-29 19:22:26 -04:00
Loren Shih be553242ef Automated merge up from viewer-development into mesh-development 2011-03-21 10:38:39 -04:00
Jonathan Yap fbd241da54 STORM-1019 Resolve merge conflicts 2011-03-19 16:29:32 -04:00
Richard Linden 2a83929a58 SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml file) is in Advanced mode
fixed not being able to change to advanced mode on clean install without logging in
2011-03-19 00:59:17 -07:00
Richard Linden 784c2079e9 SOCIAL-714 FIX Basic mode to launch with Destinations panel open by default 2011-03-17 15:57:57 -07:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Richard Linden a024493c04 eol fixes 2011-03-15 13:36:23 -07:00
Jonathan Yap 834d0f1ed6 STORM-1019 Fixed problem with beacon message display and changed beacon message order to corresponed with menu order per Ardy Lay's suggestion 2011-03-12 11:43:20 -05:00
Dave Parks bcc54d4964 SH-477 Put estimated streaming cost back in the debug display -- use newfangled equation. 2011-03-11 16:39:03 -06:00
Dave Parks 666f06eace SH-874 Followup -- use GL_NVX_gpu_memory_info for NVIDIA chips to detect actual installed and available VRAM. 2011-03-10 11:46:16 -06:00
Dave Parks ca610bfc82 merge 2011-03-10 00:42:08 -06:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
callum aac70bccad Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798) 2011-03-09 15:34:43 -08:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Jonathan Yap ecb693e825 STORM-1040 Added code for media beacons, which are coming in Storm-1019 2011-03-04 11:35:50 -05:00
Jonathan Yap 4d8244573c STORM-1040 Text that shows what Beacons you are viewing is always in English 2011-03-04 08:46:45 -05:00
Richard Linden 92403b4ea1 SOCIAL-593 FIX Profile Window cannot be resized in minimal skin
floater view snapping rectangle is now driven by floater_snap_region view
2011-03-02 21:05:03 -08:00
Dave Parks 5eeca73940 SH-1072 Fix for DoF focal point being incorrect. 2011-03-01 15:22:17 -06:00
Richard Linden 903b3ab35d SOCIAL-601 FIX avatar picker hint 2011-02-28 17:38:35 -08:00
Richard Linden 31d0bf5ba5 updates destination guide and avatar picker urls
added close button to destination guide and avatar picker
2011-02-25 13:48:20 -08:00
Xiaohong Bao 3f6208b176 Merge 2011-02-24 16:20:43 -07:00
Jonathan Yap 5ef27b9f3f STORM-1019 Minor adjustment to media beacon name 2011-02-24 14:16:03 -05:00
Robin Cornelius 668307e4e3 STORM-1019 Add ability to display beacons for Media on a Prim objects
Changes merged into viewer 2 by Jonathan Yap
2011-02-23 15:50:55 -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
Loren Shih ba4afc4a30 Automated merge up from viewer-development into mesh-development 2011-02-02 16:36:33 -05:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Dave Parks 2d04379bea merge 2011-02-01 02:06:53 -06:00
Dave Parks d3bfbd8ebb SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects. 2011-02-01 02:06:36 -06:00
Dave Parks faac42bca7 SH-469 Stop using framebuffer objects for hi-res snapshots. 2011-01-26 17:06:35 -06:00
Xiaohong Bao 8f54dc2958 for SH-846: design and implement the debug code to locate memory leaking 2011-01-26 11:13:04 -07:00
Dave Parks d7db673dc7 Fix for leaking occlusion queries -- try not to hold onto so many stale occlusion query references. 2011-01-21 18:25:57 -06:00
Xiaohong Bao 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
leyla_linden b5e67321c3 SH-821 Selectively show/hide mesh render info 2011-01-19 11:37:42 -08:00
Xiaohong Bao feb5fbc66e debug tool to show texture info for SH-659: small textures not loaded. 2011-01-18 10:41:37 -07:00
Dave Parks 4056ab8fbf SH-506 Remove (now obsolete) streaming cost info display. 2010-12-17 14:45:47 -06:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Dave Parks 48b107ac97 Apparently the new standard is to NOT suffix ARB extension function pointers with ARB. 2010-12-03 02:37:14 -06:00
Dave Parks 98802a1ef9 Merge 2010-12-02 21:34:01 -06:00
Dave Parks 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
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Dave Parks 894dd833f7 Depth of Field whenever "Lighting and Shadows" is enabled and global-illumination is not (experimental). 2010-11-24 03:36:41 -06:00
Andrew Productengine 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
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Dave Parks d682394d02 merge 2010-11-11 11:23:10 -06:00
Oz Linden a942a64b89 merge fixes for STORM-546 2010-11-09 19:40:58 -05:00
Kent Quirk cb54738a49 Merge from beta 2010-11-09 16:31:16 -05:00
Kent Quirk 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