e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07: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
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
fae9c8fe86
Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
...
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
2010-01-18 17:58:12 -08:00
b06d655727
Add cursor-change override while dragging on the mac
...
This changes the setCursor() call in LLWindowMacOSX to be ignored if we're
currently dragging via the OS
http://codereview.lindenlab.com/273045
2010-01-11 18:44:00 -08:00
1500e90ecc
Make sure mac build honors compile-time flag that en/disables OS drag and drop.
...
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
2010-01-08 15:11:03 -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
fe0b027d4d
Added the LLWindowCallbacks::DragNDropAction enum, and made the mac implementation and the cross-platform window callbacks use it (instead of 'bool drop').
...
This will break the windows impl until someone fixes it to match.
2009-12-03 17:40:58 -08:00
bfe66526c8
Rewrote LLWindowMacOSX::handleDragNDrop() to use pasteboard manager instead of old, busted scrap manager to extract the data. Also fixed a mouse coordinate issue that caused drag tracking to be off.
2009-12-03 17:01:58 -08:00
c272582ab7
Change API to no longer include slurl argument (its a platform-agnostic policy), add some code (not working yet) to implement DND on the mac
2009-12-03 11:48:28 -08: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
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
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
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +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
669d1162f4
QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
2008-04-17 14:56:00 +00:00
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
55c25229b7
svn merge -r 83778:83944 maint-ui-10-merge
...
QAR-442
2008-04-03 18:43:54 +00:00
6fcf38217e
merge release@82858 maint-render-2-merge@83010 -> release
...
QAR-389
2008-03-25 22:50:26 +00:00
b01d567a5d
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
...
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Richard Nelson