Commit Graph

84 Commits (98d776ba767aa9d02f5059fd8436206135b49f9f)

Author SHA1 Message Date
Nicky 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
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Ansariel 1e2d424f9e STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item 2011-12-05 23:35:29 +01:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Richard Linden 20221c8e77 EXP-1485 FIX -- Viewer should have a minimum size
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
callum 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
Leslie Linden 727199e223 EXP-1487 FIX -- Minimum window size on mac 2011-10-31 12:49:57 -07:00
Dave Parks 1a499c13c8 NEVER use glFinish outside shutdownGL 2011-10-12 11:06:57 -05:00
Nyx (Neal Orman) 8f94ff85f9 merging up latest mesh-development to nyx-mesh-development 2011-05-17 12:13:54 -04:00
Dave Parks 8017900e7f merge 2011-05-12 18:50:22 -05:00
Leslie Linden a52019d6d1 SH-1521 FIX -- Lighting and Shadows grayed out on mac
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files

Reviewed by davep
2011-05-10 14:34:36 -07:00
Leslie Linden 36f8899861 EXP-637 FIX -- As a new user, I would like Second Life to start up with a maximized window to fully immerse myself in the experience
Mac viewer now properly supports the calls to maximize and unmaximize the screen.

Reviewed by Callum
2011-04-25 17:31:04 -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
Ansariel 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
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn 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
Tonya Souther 1b3d330f85 Allow opening files from within Firestorm on OS X. Fixes FIRE-720 for OS X users. 2011-05-07 16:53:39 -05:00
Tonya Souther e1072ac2f6 EOL fixes. 2011-05-05 20:05:16 -05:00
kadah a7e724e6c6 Less intrustive code for legacy cursor support 2011-01-18 17:27:11 -08:00
Arrehn afd3be7439 Fixing duplicate '{' from V1-style icons checkin 2011-01-16 11:08:38 -05:00
kadah 80e2a367a3 Added support for legacy cursors 2011-01-15 20:07:08 -08:00
Arrehn 15c8a8cc0a Branding updaters & Crashloggers. These aren't used, but better to do it now. 2010-11-21 12:05:51 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04: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 beaeb85d8f merge
--HG--
branch : product-engine
2010-03-18 16:38:23 +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
Igor Borovkov 9229f09928 Backed out changeset a95c1f4dcf02 EXT-4820([NUX] Viewer dimensions on first-run)
by which "implemented LLWindowMacOSX::maximize() method"

--HG--
branch : product-engine
2010-03-18 16:28:54 +02:00
Richard Linden 2240ece438 EXT-2418 - improved cursors for sit/open/buy 2010-03-09 16:21:52 -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
Eugene Mutavchi 870dcca787 Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - implemented LLWindowMacOSX::maximize() method
--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 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
Rick Pasetto df69302cd2 Add restoring of previous cursor to mac impl
http://codereview.lindenlab.com/273045
2010-01-12 11:31:07 -08:00
Rick Pasetto 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
Rick Pasetto 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
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 aa2cdcfeef merge 2009-12-07 13:22:20 -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
Monroe Linden 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
Monroe Linden 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
Rick Pasetto 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
Loren Shih 99179a0195 Remove targeted swear word. We don't need Mozilla to know that we think they're ****ers.
--HG--
branch : avatar-pipeline
2009-12-03 10:27:05 -05:00
Monroe Linden 8f451be20e Change to fix DEV-43230 (Japanese input methods don't work with the web browser plugin on the Mac.)
Inside LLWindowMacOSX::allowLanguageTextInput(), tell the Text Services Manager to put up its own UI for input methods if language text input is being disallowed.  This means that the non-inline UI will come up when when entering text in a browser plugin instance with an interactive text input method selected.
2009-11-20 17:12:46 -08:00