Commit Graph

4630 Commits (d0262fa7ce49a838e9a4530e5de8fe119de64510)

Author SHA1 Message Date
Rick Pasetto d0262fa7ce Dial down logging in mediadataclient 2009-12-16 15:41:08 -08:00
Rick Pasetto e1b712a3a6 DEV-42827: auto-hide media controls volume slider if neither it nor mute button has the mouse over it
Review #66
fade-out was going to be harder, but just making it visible/invisible turned out to be pretty easy
2009-12-16 15:03:21 -08:00
Rick Pasetto a9948da80a DEV-41904: Have F1 key bring up context-sensitive help for media controls
Review #65

Adds help topic to media controls panel, and add handling F1 key to media focus
2009-12-16 14:39:06 -08:00
Rick Pasetto aee5dc6172 Enable OK button in media settings panel even if nothing is changed, but have it be a no-op
Review #63

This change addresses an issue where the OK button was greyed out even if nothing was different (changed) in the medias settings floater. This originally was implemented so that no "empty media" data would accidentally get added to the object. But that was confusing (the OK button should never be greyed out). This changes it so that apply() will simply be a no-op if the data has not changed, and now the OK button is always enabled.
2009-12-16 11:16:41 -08:00
Rick Pasetto 52ab75d1e5 Undo previous change to this file. 2009-12-16 10:05:25 -08:00
callum 966b2ebfe2 Misnamed additional Qt/WebKit DLL. 2009-12-15 21:02:16 -08:00
Monroe Linden c9a284fc69 Updated llqtwebkit 4.6 build, with link-target and cookie-saving patches applied. 2009-12-15 17:48:52 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00
Rick Pasetto fc40740e1e Add a PrimMediaMasterEnabled debug flag to allow us to disable the media data client
Conceptually reviewed by Monroe
2009-12-15 17:04:09 -08:00
Rick Pasetto e62ee60e11 merge 2009-12-15 14:32:32 -08:00
Rick Pasetto 9cf8c3e654 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/ 2009-12-15 14:05:16 -08:00
Eric M. Tulla (BigPapi) 89a8182c2c Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-15 16:21:10 -05:00
Eric M. Tulla (BigPapi) eafd52200d fix for post merge compile error (minor) 2009-12-15 16:20:17 -05:00
Ramzi Linden 0f5a757540 L10N: some legacy strings were left in panel_preferences_setup.xml. At least I will make them consistent. 2009-12-15 13:12:16 -08:00
Eric M. Tulla (BigPapi) 08495d3f63 Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-12-15 15:41:51 -05:00
Monroe Linden 1f7bf92168 New mac build of llqtwebkit.
This build is based on the following:

http://bitbucket.org/girish/llqtwebkit-4.6/
	revision 08c337619f50
	local change: comment out the definition of qt_sendSpontaneousEvent() in llembeddedbrowserwindow.cpp

git://gitorious.org/~girish/qt/girishs-qt.git
	branch lindenqt
	revision b4820037eac5c52d44df99ec37a50edd1796c897
2009-12-15 12:41:20 -08:00
Mike Antipov 06f8017674 added more comments to code
--HG--
branch : product-engine
2009-12-15 19:32:22 +02:00
Mike Antipov 5eb82cdeaa Work on task EXT-3147 (Implement new states for message indicators)
-- Implemented requirement: Opening either Message Well will clear the "new messages" state (and thus the "lit" status),
 even though there may still be unread messages

--HG--
branch : product-engine
2009-12-15 18:56:38 +02:00
Lynx Linden 870d4449f5 EXT-3441: Support various substitutions for Search URL.
The search URL is now specified in app_settings/settings.xml (instead
of in floater_search.xml), and it is now defined more flexibly with
support for various substitution strings, such as [QUERY], [AUTH_KEY],
[MATURITY], [GODLIKE], etc.

I pulled the common substitution code out into a new static method,
LLWeb::expandURLSubstitutions(). This provides support for common
strings like [VERSION], [CHANNEL], [LANGUAGE], [OS], etc. The Help and
Home sidetray code has been updated to use this new function, to avoid
replicating this behavior 3 times.

I also cleaned up the app_settings/settings.xml file and removed the
old search keys of: SearchURLDefault, SearchURLQuery, and
SearchURLSuffix2.
2009-12-15 16:00:28 +00:00
Mike Antipov eccc3ed597 Work on task EXT-3147 (Implement new states for message indicators)
-- fixed bug: Well icon leaves in "Unlit" state if new message arrives when it is in the "Lit" state while flashing
Improved behavior of reversing Lit/Unlit states

--HG--
branch : product-engine
2009-12-15 16:41:52 +02:00
Mike Antipov 40a10565ac Work on task EXT-3147 (Implement new states for message indicators)
-- Code recactored for future implementation of "Opening either Message Well will clear the "new messages" state (and thus the "lit" status)"

--HG--
branch : product-engine
2009-12-15 15:40:13 +02:00
Alexei Arabadji c77266e216 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-15 19:11:08 +02:00
Alexei Arabadji 7ba2f99ae0 mplemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel is opened”;
--HG--
branch : product-engine
2009-12-15 19:10:27 +02:00
Sergei Litovchuk 0847789222 Fixed normal bug EXT-3409 "Places panel: pick for remote location created with current agent's coordinates".
- Fixed storing global position for remote location pick.
- Fixed setting current location to the pick.
- Fixed pick location text. Added resolving remote parcel name from ID.
- Cleaned up unused code in llpanelpick.

--HG--
branch : product-engine
2009-12-15 18:36:53 +02:00
Vadim Savchuk e303864c17 Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.

--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
Dmitry Zaporozhan 40fa036891 Fix for normal bug EXT-3465 - Any changes made in Preferences floater are canceled after viewer shutdown.
--HG--
branch : product-engine
2009-12-15 16:18:26 +02:00
Yuri Chebotarev fe56e4fbfb fix for bug EXT-3254 IM well expands unexpectedly after attempt to resize
problem was with floater minHeight. set minheight to 1 list item height (so 1 item is always visible)

--HG--
branch : product-engine
2009-12-15 14:28:51 +02:00
Yuri Chebotarev 50792b7c2a fix for normal EXT-3252 IM well closes if the lower IM session has been closed
--HG--
branch : product-engine
2009-12-15 13:22:09 +02:00
Lynx Linden d82f82d796 EXT-3394: Reverting removal of prefs volume slider.
This change reverts the code parts of e038c0211968 that relate to the
sound preferences slider. Lis has already re-enabled the slider in the
panel_preferences_sound.xml XUI file.

So the overall change for EXT-3394 is now:
- remove the volume slider from the Voice Controls panel
- make 50 be the default volume level, not 62
2009-12-15 11:11:28 +00:00
Dmitry Zaporozhan c157c1176a Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking.
Docked LLDialogs are part of toasts positioning rules.

--HG--
branch : product-engine
2009-12-15 10:54:37 +02:00
Alexei Arabadji 02e5d2fd83 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-15 09:55:36 +02:00
Alexei Arabadji f8f1252d32 mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby chat, should work as toggles”,
made hide/unhide dockable floaters when undocked;

--HG--
branch : product-engine
2009-12-15 09:55:00 +02:00
Paul Guslisty 9294902626 Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places panel)
--HG--
branch : product-engine
2009-12-15 08:35:26 +02:00
Rick Pasetto 60e6fa139e Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-14 17:58:19 -08:00
Rick Pasetto 77aa787c01 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-14 17:57:13 -08:00
Rick Pasetto c0eb697a53 Change LLViewerMedia::isInterestingEnough() to also check selection
If the object is in the selection, its interesting.  Load its media data
ASAP.

Conceptually reviewed by monroe
2009-12-14 17:39:24 -08:00
Rick Pasetto c063647b58 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-14 17:30:17 -08:00
Rick Pasetto a386296855 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-14 17:28:04 -08:00
Rick Pasetto c2f7e88fea DEV-43872: Change Home URL and Current URL to Home Page and Current Page 2009-12-14 17:27:46 -08:00
brad kittenbrink cee8909ee4 Final merge of precompiled header dependency cleanup work. 2009-12-14 16:53:52 -08:00
Monroe Linden 2078125f9a Only do the "lowest interest loadable" calculation if we've already hit the PluginInstancesTotal cap. Otherwise, we always need to load the top media data item. 2009-12-14 16:44:22 -08:00
brad kittenbrink e8c150b6b1 Yet again more fixups for compile errors after the last merge... 2009-12-14 16:34:20 -08:00
Ramzi Linden 3db7dd4541 L10N: used consistent terms between Pref > Advanced and floater_select_key ! 2009-12-14 16:33:47 -08:00
Rick Pasetto 909a16e520 DEV-43913: tweak positions of play & pause so they look like they are the same button 2009-12-14 16:22:37 -08:00
Rick Pasetto 7a7562724d follow-up from my last change 2009-12-14 15:47:57 -08:00
Rick Pasetto b877ed17e8 DEV-42327: Compute controls position & size for HUD objects
Review #62
Added facility to get the HUD projection and modelview matrices by refactoring the calls in llviewerdisplay a bit.
2009-12-14 15:41:09 -08:00
Monroe Linden 38483348ee Made LLViewerMedia::isInterestingEnough() take the performance manager's priority list list into account. 2009-12-14 15:15:08 -08:00
richard 0d9bae83ed merge 2009-12-14 14:54:37 -08:00
richard 861640adf9 merge 2009-12-14 14:35:24 -08:00