002c9b3f3d
MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext
2012-04-11 16:02:24 -05:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
4c333d64ca
EXP-1832 FIX Viewer Size not persistent across logins
...
Save *window* width and height, not client area
2012-02-16 15:45:43 -08:00
12b4862330
EXP-1832 FIXED Viewer Size not persistent across logins.
...
Symptoms: Viewer window shrank by a few pixels on each startup.
Reason: We used client rect (which did not include the window border) to create the viewer window.
Solution: Convert client rect into window rect, i.e. expand it by the border size.
2012-02-13 19:57:35 +02:00
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
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
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
987463d924
EXP-1765 POSSIBLE_FIX crash on startup at LLWindowWin32::switchContext(...)
2012-01-27 13:18:27 -08:00
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
52fc943c6d
Merge up to 26312 / 0010858de5a1 (V/dev tip).
2012-01-27 18:29:47 +01:00
9cdfecd9e1
EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext()
2012-01-10 10:40:27 -08:00
dd9263d017
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-08 11:02:00 -08:00
6ef7838cd2
Merge up to 25972:7fceba778ee6 (V/Dev)
2012-01-17 21:15:06 +01:00
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
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
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
6b516b7a6c
merge changes for vmrg-182
2011-11-08 15:59:50 -05:00
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
f6e3d0e581
EXP-1486 FIX -- Minimum window size on windows
...
Reviewed by Callum.
2011-10-31 13:27:25 -07:00
bc65e929fc
SH-2240 Fix for heap corruption under debugger when starting viewer with basic shaders disabled.
2011-10-31 11:29:32 -05:00
51c7887f8d
merge
2011-10-31 11:35:22 -04:00
0cc30aec0f
some debug code for SH-2391: [crashhunters] pre-login crash at LLViewerWindow::LLViewerWindow
2011-10-24 22:28:57 -06:00
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
bd02cdc75f
merge
2011-09-26 19:27:10 -05:00
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
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
ff60546070
merge
2011-08-22 13:16:02 -04:00
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
8f94ff85f9
merging up latest mesh-development to nyx-mesh-development
2011-05-17 12:13:54 -04:00
e0adaa188b
fix dos line endings
2011-04-09 22:49:10 -04:00
7cc0388d81
FIX VWR-25444: properly initialize DEVMODE structure to prevent crash.
2011-04-06 14:55:09 -07:00
d1683bd65a
glFlush != glFinish. doh.
2011-01-13 13:46:00 -05:00
8fae5d49bf
testing: adding glFlush() each frame for performance testing
2011-01-07 18:24:35 -05:00
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
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
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
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
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
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
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
06eeb3fffb
Completed, added open capabilities to chat logs, crash logs, cache and settings file locations.
2011-02-10 16:42:12 -05:00
a7e724e6c6
Less intrustive code for legacy cursor support
2011-01-18 17:27:11 -08:00
80e2a367a3
Added support for legacy cursors
2011-01-15 20:07:08 -08:00
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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
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
10905a7ed1
merge from viewer-hotfix
2010-04-15 10:22:42 +01:00
fcb36144dd
accidentally changed default cursor for testing purposes, reverted
2010-04-14 20:17:44 -07:00
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
8dd6286309
merge from viewer-hotfix
2010-04-14 09:47:58 +01:00
7e210d185f
fix for EXT-6317 and EXT-2418 regressions in installed viewers
...
new 32-bit mouse cursors were not getting packaged by installer for windows builds
reviewed by Monroe
2010-04-13 18:07:24 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
c67bc96278
Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."
--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
f6754b9fd0
improved mouse cursors (32-bit)
2010-03-09 19:12:43 -08:00
e5c4438fd7
merge
2010-03-09 13:27:26 -08:00
dcf279d663
EXT-2418 added open/sit/buy mouse cursors
2010-03-05 18:34:36 -08:00
48fd4c8d14
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
3699be5c45
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-05 18:38:16 -08:00
8b0ae67e73
Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in the key data.
...
Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data. Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data.
Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask". The Qt (non-native) modifiers should be good enough.
2010-02-05 18:23:16 -08:00
80139d95ad
added code to grab raw key codes from Win32 WPARAM and LPARAM and send to plugin
...
factored out keyboard message deserialization for media_plugin_webkit
new version of llqtwebkit with Girish's changes to keyboard and cursor handling code
2010-02-04 16:30:21 -08:00
9430b8de65
dos2unix these files
2010-02-01 16:29:52 -08:00
e31d695247
get rid of commented-out code
2010-01-08 15:11:15 -08:00
8944bc36ed
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-08 14:12:15 -08:00
9e0e4153ca
EXT-3994 - Mouse wheel zoom on 2nd monitor unexpectedly works if pointer...
...
reviewed by Mani
2010-01-07 13:49:55 -08:00
4a92f49e7b
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 09:28:47 -08:00
7ff7709f9f
Expose window minimize and restore in LLWindow interface.
...
Add secondlife:///app/login/reg handler for Reg-In-Client
Reviewed with Ambroff
2009-12-04 17:33:36 -08:00
4c33c54ce0
Fix windows build to now use DragNDropAction instead of a bool 'drop'
2009-12-03 19:02:12 -08:00
ff53d4ff9b
Fix Windows build based on API change to handleDragNDrop()
2009-12-03 12:19:02 -08:00
e2e7d544b6
Added support for dropping SURLs onto viewer
...
Does right thing when logged in - needs some work at login page
Removed (commented out) WM_DROPFILES code for now
2009-11-24 20:20:53 -08:00
bf5ce0fcbd
Change 'handleDrop()' API to 'handleDragNDrop', which now takes a "drop" BOOL
2009-11-12 11:06:29 -08:00
caa631bf5b
Added IDropTarget interface. Still lots of cleanup but this works ok.
...
You can drag over from Firefox or IE onto a prim
2009-10-27 17:52:04 -07:00
eba6d0236f
Backed out changeset: 57dc52edbbc9
2009-10-21 16:01:52 -07:00
7135537435
Backed out changeset 60da2fc952a0
2009-10-21 11:15:46 -07:00
2528d3a75f
Test code to allow drag/drop of *file* (not URLs) into the viewer Window - Will not be pushed to main repository - only committed so I can bundle my changes and share
2009-10-21 11:01:11 -07:00
750f94ca69
EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly.
2009-10-07 00:15:11 +00:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
df4f20d4f5
merge uv-picking branch.
...
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
Dave Parks