Commit Graph

8968 Commits (d86dc7bc95a330c72fcb95dff008a8a5b9022a0f)

Author SHA1 Message Date
Eli Linden d86dc7bc95 Merge 2010-04-09 18:37:55 -07:00
Eli Linden 113e2226db VWR-17819 removing old param overrides 2010-04-09 18:37:14 -07:00
Richard Nelson c645df97e7 merge 2010-04-09 13:14:02 -07:00
Richard Nelson 469e06f8af EXT-6796 - selecting emote in animation upload preview doesn't do anything
reviewed by Mani
2010-04-09 13:11:21 -07:00
Monroe Linden db3641363d Set up volume control code in webkit plugin for platform-specific implementations
Renamed LinuxVolumeCatcher class to VolumeCatcher.  Everything in the header except the class name was already platform-agnostic, so I just renamed it to volume_catcher.h.

Moved the stub implementation from the end of linux_volume_catcher.cpp (previously only used if LL_PULSEAUDIO_ENABLED was not defined) to dummy_volume_catcher.cpp, and made CMakeList.txt file use the dummy impl on Linux if PULSEAUDIO is not defined.

Removed the ifdefs on the use of VolumeCatcher in MediaPluginWebkit, so it gets called on all platforms.

Added a setPan() function to VolumeCatcher (currently unimplemented, but we'd like to have this capability in the future).
2010-04-09 12:34:24 -07:00
Kent Quirk 0da8fb6035 Change comment that wasn't updated with the code. No functionality changes. 2010-04-09 09:26:31 -04:00
Eli Linden 4ed913c376 Merge 2010-04-08 17:06:42 -07:00
Eli Linden 2a42ba08a3 EXT-2187 NL translation for set1 and set2, new files 2010-04-08 17:06:06 -07:00
Eli Linden 63e7d285e7 EXT-2187 NL translation for set1 and set2 2010-04-08 17:05:56 -07:00
Leyla Farazha 571ee16a1f Merge 2010-04-08 16:22:19 -07:00
Leyla Farazha 1c4b608506 EXT-6670 Streaming Music does not obey Media Auto-play until restart
reviewed by Richard cc#183
2010-04-08 16:19:14 -07:00
Xiaohong Bao 3ff6c57621 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-08 17:09:21 -06:00
Xiaohong Bao 1fd83d32f3 fix for EXT-6278: profile picture is blurry / fuzzy if IM is opened first. 2010-04-08 17:08:32 -06:00
Leyla Farazha 11db894ba9 EXT-6557 Login screen menus disappear on restore down
reviewed by Richard cc#181
2010-04-08 16:04:18 -07:00
Leyla Farazha a0ad3ea4fa EXT-6503 Setting a "click to" action in the Build tool breaks Shared Media interaction
reviewed by richard cc#182
2010-04-08 16:03:37 -07:00
Aimee Linden 31e85ba276 Another small fix-up from backing out the SLE merge 2010-04-08 13:09:10 +01:00
Aimee Linden 526fb2fdd4 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-08 12:38:41 +01:00
Aimee Linden 2b8e82a1f4 Fix-up some breakage from backing out the SLE merge.
Was causing a crash on viewer exit if the Voice Control Panel was left open and detached.
2010-04-08 12:37:12 +01:00
Tofu Linden e979e48bc0 PE viewer-trunk merge. 2010-04-08 08:57:16 +01:00
Alexei Arabadji 8ce661ae5d Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
2010-04-08 10:50:57 +03:00
Alexei Arabadji d218276bdc fixed EXT-3703 Startup toast message doesn't fit toast width
* reverted changes made previously by rev. f0663aa57134;
* added calculation of toast height difference based on LLTextBox::reshapeToFitText;
* added vertical centering of message textbox;
reviewed by Mike Antipov at
https://codereview.productengine.com/secondlife/r/195/

--HG--
branch : product-engine
2010-04-08 10:49:48 +03:00
Paul Guslisty 66b3fbf176 Fixed major bug EXT-6605 (No profile verb button on Places panel)
- Added functionality of showing place profile to the LLPanelPlacesTab hierarchy. Use this functionality from LLPanelPlaces as callback for profile button click.

Reviewed my Mike Antipov at https://codereview.productengine.com/secondlife/r/191/

--HG--
branch : product-engine
2010-04-08 08:06:40 +03:00
Eli Linden ac8537b4ee ES linguistic 2010-04-07 19:08:56 -07:00
Monroe Linden 2ba90ca871 Fix for EXT-6756: google apps auth doesn't work right with shared media cookies
Added "HttpOnly" to the allowed field names in LLPluginCookieStore::Cookie::parse().  (This was the actual cause of the failure -- cookies with this field in them were silently failing to parse.)

Added some LL_WARNS logging on this sort of cookie parse failure, which will make similar problems much easier to track down in future.

Also added tags to most of the logging in llplugincookiestore.cpp to make it easier to selectively enable it when debugging.

Added a cookie with all allowable field names to the unit test.

Reviewed by Sam at http://codereview.lindenlab.com/1247014
2010-04-07 18:15:56 -07:00
Leyla Farazha 89fad5ded4 Merge 2010-04-07 17:09:46 -07:00
Richard Linden 463c0778ea merge 2010-04-07 16:29:39 -07:00
Richard Linden dae4f63daa EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEvent 2010-04-07 16:29:06 -07:00
Leyla Farazha 6900278d7f EXT-5646 Replace the "More >>" chevron with the art we use for the Favorites bar overflow (TabIcon_Close_Off and TabIcon_Close_Over).
cc # 179
2010-04-07 15:05:55 -07:00
Leyla Farazha 8bf3a6ad2b EXT-6308 Drag and Drop cursor indicates you can drop a URL on a Shared Media prim that you are not allowed to Navigate
reviewd by Richard cc# 178
2010-04-07 15:03:27 -07:00
Eli Linden 2288edf80f VWR-17781 en_xui_change for fixing truncation in multiple languages, esp. ES, IT, NL 2010-04-07 13:35:30 -07:00
Eli Linden 8ac6310020 Merge 2010-04-07 10:58:32 -07:00
Eli Linden a88531588e ES linguistic 2010-04-07 10:56:29 -07:00
Xiaohong Bao 5aa6abb6be Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-07 11:54:03 -06:00
Xiaohong Bao 03b0c60ff5 fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
Richard Linden 87cce27de3 merge 2010-04-07 10:37:10 -07:00
Eli Linden de62c33781 Merge 2010-04-07 10:27:10 -07:00
Richard Linden ecca603f02 merge 2010-04-07 10:21:43 -07:00
Richard Linden ff6c503c9a EXT-4885 - [DnD] cannot drag slurls from Google Chrome into SL on windows 2010-04-07 10:17:05 -07:00
Vadim Savchuk 76e50ba3cc merge
--HG--
branch : product-engine
2010-04-07 19:25:18 +03:00
Andrew Dyukov bc71f93ce3 Fixed major bug EXT-6602 (Sidebar panel focus goes to filter field, obscuring watermark text).
-Set focus on sidetray tabs open to tab containers which hold panels with lists, so now filter fields are not emptied. Used "default_tab_group" + "tab_group" attributes in xml to implement this.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/198/

--HG--
branch : product-engine
2010-04-07 19:23:40 +03:00
Eugene Mutavchi b2c9f172d3 Fixed normal bug EXT-6712(SLapp: nothing happens after click on 'secondlife:///app/group/list/show' link from Nearby chat) - added showing my groups tab in people panel.
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/196/

--HG--
branch : product-engine
2010-04-07 19:04:01 +03:00
Eugene Mutavchi 7e32ccd8d4 Fixed normal bug EXT-6715 (Favorites bar: bottom scroll button of overflow list is corrupted ) - restored 'arrow_down.tga' image, which is used by LLMenuScrollItem.
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/197/.

diff -r f3fc1679ec4e -r f4652f182c84 indra/newview/skins/default/textures/arrow_down.tga
Binary file indra/newview/skins/default/textures/arrow_down.tga has changed

--HG--
branch : product-engine
2010-04-07 18:59:18 +03:00
Vadim Savchuk c9e0b6e476 merge
--HG--
branch : product-engine
2010-04-07 18:41:15 +03:00
Vadim Savchuk bb2a0adeca Merge from default branch
--HG--
branch : product-engine
2010-04-07 18:39:29 +03:00
Mike Antipov 8329dbdc37 Fixed major bug EXT-6661 (chat log paths reset back to default)
* Removed unused InstantMessageLogFolder
 * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers.
 * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0
 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat)

Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/

--HG--
branch : product-engine
2010-04-07 18:33:05 +03:00
Tofu Linden 3ecec85feb Update Linux build of LLQtWebKit library.
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-07 15:55:21 +01:00
Yuri Chebotarev 7ba7bc6c37 merge
--HG--
branch : product-engine
2010-04-07 17:36:27 +03:00
Yuri Chebotarev d623030d2b fix for EXT-6619 "i" icon appears on top of accordion title in the Group Info panel
https://codereview.productengine.com/secondlife/r/190/
reviewed mantipov

--HG--
branch : product-engine
2010-04-07 17:35:21 +03:00
Tofu Linden adce2ecdf8 PE merge from pe-viewer-trunk 2010-04-07 13:03:35 +01:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00