livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,946 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

72 Commits (c67bc96278ea76372d896fb82fc6f3557feac446)

Author SHA1 Message Date
Igor Borovkov 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
Eugene Mutavchi 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
Monroe Linden 3699be5c45 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-05 18:38:16 -08:00
Monroe Linden 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
Callum Prentice 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
Rick Pasetto 9430b8de65 dos2unix these files 2010-02-01 16:29:52 -08:00
Rick Pasetto e31d695247 get rid of commented-out code 2010-01-08 15:11:15 -08:00
Rick Pasetto 8944bc36ed Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-08 14:12:15 -08:00
richard 9e0e4153ca EXT-3994 - Mouse wheel zoom on 2nd monitor unexpectedly works if pointer... 
reviewed by Mani
 2010-01-07 13:49:55 -08:00
Rick Pasetto 4a92f49e7b Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0 2009-12-10 09:28:47 -08:00
James Cook 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
Rick Pasetto 4c33c54ce0 Fix windows build to now use DragNDropAction instead of a bool 'drop' 2009-12-03 19:02:12 -08:00
Rick Pasetto ff53d4ff9b Fix Windows build based on API change to handleDragNDrop() 2009-12-03 12:19:02 -08:00
callum 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
Rick Pasetto bf5ce0fcbd Change 'handleDrop()' API to 'handleDragNDrop', which now takes a "drop" BOOL 2009-11-12 11:06:29 -08:00
callum 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
Rick Pasetto eba6d0236f Backed out changeset: 57dc52edbbc9 2009-10-21 16:01:52 -07:00
Rick Pasetto 7135537435 Backed out changeset 60da2fc952a0 2009-10-21 11:15:46 -07:00
callum 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
James Cook 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
James Cook 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
Richard Nelson 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
Steven Bennetts 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
Christian Goetze 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
Brad Kittenbrink 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
Adam Moss 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
Aaron Brashears 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
Mark Palange 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
Steven Bennetts d725e5b240 QAR-872 Viewer 1.21 RC 3 
merge viewer_1-21 96116-97380 -> release
 2008-09-29 19:14:50 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2 
merge viewer_1-21 94770-96059 -> release
 2008-09-12 06:27:13 +00:00
Steven Bennetts 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
Karl Steifvater 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
Josh Bell 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
Karl Steifvater 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
Steven Bennetts 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
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Steven Bennetts 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
Bryan O'Sullivan 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
Eric Tulla 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
Steven Bennetts 16baf6c9d4 merge release-QAR-499 Viewer 1.20 RC 3 
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
 2008-04-28 23:29:46 +00:00
Steven Bennetts 3901894708 QAR-488 Viewer 1.20 RC 2 
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
 2008-04-23 01:04:01 +00:00
Adam Moss 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
Steven Bennetts a3f3ab7e11 QAR-449 Viewer 1.20 RC 1 
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
 2008-04-17 02:56:14 +00:00
Steven Bennetts f5e386527c QAR-427 
merge 3dconnex-merge -r 84010 : 84039 -> release
 2008-04-04 01:22:03 +00:00
Steven Bennetts 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
James Cook 55c25229b7 svn merge -r 83778:83944 maint-ui-10-merge 
QAR-442
 2008-04-03 18:43:54 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Steven Bennetts 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release 
QAR-389
 2008-03-25 22:50:26 +00:00
Steven Bennetts 42bc4ba02a merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release 2008-02-28 01:12:38 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in 
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
 2008-02-27 18:58:14 +00:00