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
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
Tofu Linden
8dd6286309
merge from viewer-hotfix
2010-04-14 09:47:58 +01:00
Richard Linden
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
Richard Nelson
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
Richard Nelson
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
Igor Borovkov
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
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
Richard Linden
f6754b9fd0
improved mouse cursors (32-bit)
2010-03-09 19:12:43 -08:00
Richard Linden
e5c4438fd7
merge
2010-03-09 13:27:26 -08:00
Richard Linden
dcf279d663
EXT-2418 added open/sit/buy mouse cursors
2010-03-05 18:34:36 -08: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