Yuri Chebotarev
ff97c31995
fix task EXT-1960 Region messages, should they be displayed in the local chat?
...
and working on
EXT-239 Save chat window state and position between sessions (not finished)
--HG--
branch : product-engine
2009-10-30 17:00:23 +02:00
Justin C. Rounds (Chuck)
aae05b4930
Merge commit.
2009-10-30 09:58:41 -04:00
Justin C. Rounds (Chuck)
283b862814
Changed MapAvatarColor to Green.
...
http://jira.secondlife.com/browse/EXT-1486
2009-10-30 09:57:56 -04:00
Dmitry Zaporozhan
6b8c4b6df1
Merge
...
--HG--
branch : product-engine
2009-10-30 15:29:45 +02:00
Dmitry Zaporozhan
a1cc8e8a33
Fixed normal bug EXT-1970 Limit Profile info description for the following fields: Second/first life description and Second Life Groups to 512 chars
...
--HG--
branch : product-engine
2009-10-30 15:28:39 +02:00
Mike Antipov
9d31d994bb
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-10-30 14:32:43 +02:00
Yuri Chebotarev
982ed974ef
merge
...
--HG--
branch : product-engine
2009-10-30 14:29:56 +02:00
Yuri Chebotarev
0a6f3fadcf
fix normal bug EXT-1861 IM from Object to appear in Nearby Chat
...
--HG--
branch : product-engine
2009-10-30 14:29:13 +02:00
Mike Antipov
5d757d2b5f
Implemented normal task EXT-2014 (Places - Landmarks: Collapsed accordion panels should expand while filtering if they contain matched items)
...
--HG--
branch : product-engine
2009-10-30 14:23:32 +02:00
Dmitry Oleshko
7dd9fb2806
fixed normal bug (EXT-1934) [BSI] Revert EXT-543 - Notification chiclet should not count IM/Group messages
...
--HG--
branch : product-engine
2009-10-30 14:18:07 +02:00
Dmitry Oleshko
f4424f8867
fixed normal bug (EXT-1971) Add fade time period for nearby chat bubbles
...
--HG--
branch : product-engine
2009-10-30 13:24:49 +02:00
Dmitry Zaporozhan
07dabef250
Fixed normal bug EXT-1972 Nearby chat: Please limit chat field with 254 characters for simple Latin; less for multi-byte characters
...
--HG--
branch : product-engine
2009-10-30 12:39:23 +02:00
angela
4dd6626c80
merge
2009-10-30 18:00:17 +08:00
angela
e5c96332de
media inspector adding current url, secure browsing and home page button
2009-10-30 17:59:47 +08:00
Lynx Linden
6d2765a42d
Trivial XUI change to test mercurial push problems.
2009-10-30 09:38:24 +00:00
angela
96c62a7262
merge
2009-10-30 10:51:15 +08:00
angela
c1dcf8d809
merge
2009-10-30 10:49:26 +08:00
angela
22e29b1a85
merge
2009-10-30 10:48:10 +08:00
Monroe Linden
0da67c8819
In LLViewerMediaFocus::setFocusFace(), when clearing focus, only clear keyboard focus if the object had it in the first place.
2009-10-29 18:49:36 -07:00
Monroe Linden
8604c978ca
Fixes for DEV-41612, DEV-41693, DEV-41963.
...
Made LLViewerMediaFocus::update clear inworld media focus if LLViewerMediaFocus has lost keyboard focus to anything besides the media controls, or LLToolMgr::inBuildMode() returns true.
Also, never fade the media controls if they have keyboard focus (this fixes the media controls fading out while the user is trying to type an URL).
2009-10-29 18:38:02 -07:00
Monroe Linden
96e46f9127
Fix for DEV-41755
2009-10-29 18:01:51 -07:00
callum
65b74c6a5e
Merge
2009-10-29 17:35:38 -07:00
James Cook
07647fdc5e
merge
2009-10-29 17:16:49 -07:00
James Cook
dc9d17a257
Made explicit in all floaters that we are using a hack to set the top widget position,
...
took it out of master floater.xml file.
legacy_header_height is documented in LLFloater::initFromParams().
Discussed with Richard.
2009-10-29 17:16:33 -07:00
Monroe Linden
96b1f821c0
Made LLViewerMediaFocus::handleScrollWheel() grab the current keyboard modifiers.
2009-10-29 17:14:03 -07:00
Erica
3a4f906037
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 18:18:39 -07:00
Rick Pasetto
f93febc914
Merge remote repo
2009-10-29 18:16:03 -07:00
Erica
4bc4f036b2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 18:14:52 -07:00
Erica
98a9de0687
Groups profile floatercramming
2009-10-29 18:14:19 -07:00
Rick Pasetto
7f8b630253
Fix unposted bug: make sure to use the right slider control
2009-10-29 17:49:38 -07:00
angela
8c7f5e9026
branch merge
2009-10-30 08:12:41 +08:00
angela
c3b2f98012
media inspector https icon
2009-10-30 08:11:56 +08:00
angela
a74e12d26b
merge
2009-10-30 08:10:55 +08:00
Monroe Linden
5c4ec60c96
Fix a copy-paste error in LLPanelPrimMediaControls::postBuild().
2009-10-29 17:04:42 -07:00
Monroe Linden
c953385351
Missed the "hold the button down" case when converting horizontal scroller to use horizontal mousewheel events.
2009-10-29 16:59:34 -07:00
callum
b4bd34bd73
Implementation for DEV-40710 - adds name of media stream to floater tools dialog.
...
Currently, this means <title> tag for Web page or movie meta-data name for QuickTime move.
2009-10-29 16:49:29 -07:00
Monroe Linden
8357fe51aa
Added LLViewerMediaImpl::scrollWheel() to route scroll wheel events through the media impl.
...
The horizontal scroll arrows in the media controls now send horizontal scrollwheel events instead of arrow keys.
2009-10-29 16:10:37 -07:00
Monroe Linden
4d1a2ef2d1
Fix for DEV-41978 (media controls URL is incorrect after whitelist bounces webpage back).
...
Added LLViewerMediaImpl::getCurrentMediaURL(), which reflects the most recent url either set with navigateTo or received from the plugin via locationChanged/navigateComplete. LLViewerMediaImpl now uses this when reload() is called.
LLPanelPrimMediaControls now uses getCurrentMediaURL() to get the url it displays in the URL input bar and opens with the pop-out control.
2009-10-29 16:09:27 -07:00
James Cook
f553f7fd15
Fix signed/unsigned mismatch breaking the build.
2009-10-29 16:07:00 -07:00
James Cook
a1ec40c72b
merge
2009-10-29 15:39:29 -07:00
James Cook
8f8718546a
Fixed some outlines being 1 pixel away from color swatches. Not reviewed.
2009-10-29 15:37:45 -07:00
James Cook
432e243e1a
EXT-1352 Add image art to floater backgrounds.
...
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now lives
in floater.xml, not as a global saved setting. Reviewed with Richard.
2009-10-29 15:37:25 -07:00
Xiaohong Bao
361a227773
fix EXT-1661: Avatars' icons should be cached only once per 24 hours, but not every time the viewer is restarted.
...
to be reviewed by steve.
2009-10-29 16:12:12 -06:00
brad kittenbrink
1b6d09f1d2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 18:03:46 -04:00
Justin C. Rounds (Chuck)
b86d4b2299
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 17:48:09 -04:00
Justin C. Rounds (Chuck)
622cb8c2b4
Reverted back to white dot (dot will now be colorized programmatically).
...
http://jira.secondlife.com/browse/EXT-1486
2009-10-29 17:47:17 -04:00
Nyx (Neal Orman)
8bf1dd2f1b
previous checkin had a signed/unsigned mismatch. Using a cast to fix it.
2009-10-29 17:42:32 -04:00
Justin C. Rounds (Chuck)
2337735618
Merge commit.
2009-10-29 17:19:10 -04:00
Rick Pasetto
0595c97f69
Fix unposted bug where current URL is not showing in the media controls
2009-10-29 14:09:13 -07:00
Justin C. Rounds (Chuck)
a36b3baa96
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 16:55:20 -04:00