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
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
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
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
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
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
f5e386527c
QAR-427
...
merge 3dconnex-merge -r 84010 : 84039 -> release
2008-04-04 01:22:03 +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
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
6fcf38217e
merge release@82858 maint-render-2-merge@83010 -> release
...
QAR-389
2008-03-25 22:50:26 +00:00
42bc4ba02a
merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release
2008-02-28 01:12:38 +00:00
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
903292ba67
merge -r 78989:80279 Branch_1-19-0-Viewer-> release
...
Changes from 1.19.0.2 and 1.19.0.3
DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031 Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066 Checking to select a role does not enable the apply button
DEV-8809 stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans. svn merge -r77376:77377 sl-parcelmedia-3. OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 Alt and left/right arrow keys dont move you between tabs
DEV-10093 Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 Redocking the Contact list causes the communicate ui to get ugly
DEV-8131 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
2008-02-19 23:12:34 +00:00
98fd90ddd6
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
...
QAR-275 Parcel Media
Sam made me do it.
2008-02-14 01:45:59 +00:00
df4d167cd1
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +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
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
c1920e3c1c
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
...
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-11-09 01:56:15 +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
b089fc559a
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
...
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
f118e7c80b
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-13 18:02:37 +00:00
70aaa3e444
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-04 21:57:06 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
c93c38e047
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21 19:36:11 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
d1582a5105
merge -r 57111:57464 maintenance.
2007-02-05 20:20:42 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
821f998373
merge -r 57058:57111 maintenance.
2007-01-25 00:18:16 +00:00
Leslie Linden