Commit Graph

130 Commits (98d776ba767aa9d02f5059fd8436206135b49f9f)

Author SHA1 Message Date
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Richard Linden f27ea1aff7 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
Richard Linden 4e08461f8a EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
Richard Linden d56be1f175 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
callum 987463d924 EXP-1765 POSSIBLE_FIX crash on startup at LLWindowWin32::switchContext(...) 2012-01-27 13:18:27 -08:00
merov 86ef722e7c EXP-1775 : cleanup a bit PeekMessage() usage, avoid eating one event when reaching MAX_MESSAGE_PER_UPDATE. 2012-01-13 15:11:37 -08:00
Nicky 52fc943c6d Merge up to 26312 / 0010858de5a1 (V/dev tip). 2012-01-27 18:29:47 +01:00
callum 9cdfecd9e1 EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext() 2012-01-10 10:40:27 -08:00
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Nicky 6ef7838cd2 Merge up to 25972:7fceba778ee6 (V/Dev) 2012-01-17 21:15:06 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Ansariel 1e2d424f9e STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item 2011-12-05 23:35:29 +01:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Richard Linden 20221c8e77 EXP-1485 FIX -- Viewer should have a minimum size
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
callum e4e4977f5e EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
Oz Linden 6b516b7a6c merge changes for vmrg-182 2011-11-08 15:59:50 -05:00
Dave Parks fa5a0a90f4 SH-2240 Fix for core profile assertions when Debug GL enabled. 2011-11-03 15:00:40 -05:00
Leslie Linden f6e3d0e581 EXP-1486 FIX -- Minimum window size on windows
Reviewed by Callum.
2011-10-31 13:27:25 -07:00
Dave Parks bc65e929fc SH-2240 Fix for heap corruption under debugger when starting viewer with basic shaders disabled. 2011-10-31 11:29:32 -05:00
Brad Payne (Vir Linden) 51c7887f8d merge 2011-10-31 11:35:22 -04:00
Xiaohong Bao 0cc30aec0f some debug code for SH-2391: [crashhunters] pre-login crash at LLViewerWindow::LLViewerWindow 2011-10-24 22:28:57 -06:00
Dave Parks 967479f903 SH-2031 Fix for stall in image update -- don't use the CPU to convert a height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish? 2011-10-05 15:12:02 -05:00
Dave Parks bd02cdc75f merge 2011-09-26 19:27:10 -05:00
Dave Parks a2d08a6d80 SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors. 2011-09-22 00:10:57 -05:00
Dave Parks 66acb932ba SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context. 2011-09-20 03:34:09 -05:00
Brad Payne (Vir Linden) ff60546070 merge 2011-08-22 13:16:02 -04:00
Xiaohong Bao 13e152c92d fix for SH-2177: Second Life Crashes On Startup in Advanced Mode -- I have reinstalled SL, Clear Caches -- Nothing Works 2011-08-03 14:54:53 -06:00
Nyx (Neal Orman) 8f94ff85f9 merging up latest mesh-development to nyx-mesh-development 2011-05-17 12:13:54 -04:00
Oz Linden e0adaa188b fix dos line endings 2011-04-09 22:49:10 -04:00
Andrew A. de Laix 7cc0388d81 FIX VWR-25444: properly initialize DEVMODE structure to prevent crash. 2011-04-06 14:55:09 -07:00
Nyx (Neal Orman) d1683bd65a glFlush != glFinish. doh. 2011-01-13 13:46:00 -05:00
Nyx (Neal Orman) 8fae5d49bf testing: adding glFlush() each frame for performance testing 2011-01-07 18:24:35 -05:00
Ansariel 0a14d57cdb FIRE-3798/STORM-1713: Linden Lab approved version of the fix for mouse cursor flickering when hovered over inworld objects 2011-12-08 18:20:08 +01:00
Ansariel bae42f3918 Perfomance fix: Don't call glFinish because it kills parallelism; Originally found by Shyotl Kuhr (Singularity) 2011-11-01 23:18:04 +01:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Xiaohong Bao cef8b71fa6 fix for SH-2177: Second Life Crashes On Startup in Advanced Mode -- I have reinstalled SL, Clear Caches -- Nothing Works 2011-08-03 14:54:53 -06:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Tozh f4e30cccd8 Added avatar full name to the window header - base and Windows platform (still needs Mac and Linux) 2011-03-20 12:22:57 -04:00
JessicaLyon 06eeb3fffb Completed, added open capabilities to chat logs, crash logs, cache and settings file locations. 2011-02-10 16:42:12 -05:00
kadah a7e724e6c6 Less intrustive code for legacy cursor support 2011-01-18 17:27:11 -08:00
kadah 80e2a367a3 Added support for legacy cursors 2011-01-15 20:07:08 -08:00
callum 95ecad54c6 EXP-112 Enable fullscreen mode (with mode switch, not resize to desktop) as per 1.x viewer. 2010-09-28 16:52:56 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Yuri Chebotarev 2479959dd9 additional fix for EXT-4858 Normal "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
reviewed Mike Antipov
EXT-4858 "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0

--HG--
branch : product-engine
2010-04-30 17:42:25 +03:00
Yuri Chebotarev 3d13402419 fix EXT-4858 "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
reviewed Vadim Savchuk
https://codereview.productengine.com/secondlife/r/317/

--HG--
branch : product-engine
2010-04-27 19:28:42 +03:00
Tofu Linden 10905a7ed1 merge from viewer-hotfix 2010-04-15 10:22:42 +01:00
Richard Nelson fcb36144dd accidentally changed default cursor for testing purposes, reverted 2010-04-14 20:17:44 -07:00
Richard Nelson bd2b97fe40 EXT-2418 and EXT-6317
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
2010-04-14 20:06:06 -07:00