Commit Graph

2094 Commits (caca1eae26b324f22d40cf66ffb6ff8a99e0ceef)

Author SHA1 Message Date
Erica caca1eae26 Convert URLs in notifications and viewer stings to wiki URL format EXT-1952, Reword Abuse Report notification to reduce wordcount EXT-1953 2009-10-31 12:44:34 -07:00
CG Linden 1f3212b680 Add missing eol 2009-10-31 04:25:48 -07:00
Xiaohong Bao 4e1cde2e39 merge 2009-10-30 21:34:52 -06:00
Xiaohong Bao 01d06db015 sync to the tip. 2009-10-30 21:28:52 -06:00
Xiaohong Bao 801301c435 fix DEV-41913: parcel media does not display on particle textures. 2009-10-30 21:22:47 -06:00
richard a857fe1d82 merge 2009-10-30 19:07:55 -07:00
richard 60771cce54 forgot to add toolt_tip.xml 2009-10-30 19:07:41 -07:00
Erica bc0d740dfe EXT-2053 Add parcel permission icons to place profile, layout to spec 2009-10-30 19:05:28 -07:00
richard d8d678307c merge 2009-10-30 18:24:42 -07:00
Monroe Linden 2fadd99877 Another experiment: made the selection in the nearby media floater track the media impl the media controls are currently referencing (either focus or hover). 2009-10-30 18:14:20 -07:00
Monroe Linden 9e602de33a On a double-click in the nearby media list, try to focus/zoom in on the prim holding the media. 2009-10-30 17:46:48 -07:00
richard c964f28190 merge 2009-10-30 17:46:28 -07:00
richard b82bda605d EXT-2018 PRofile "Real World" descripton scrolls before showing "More" link
EXT-2011 titles of IM sessions aren't aligned to center
EXT-3025 Pick's description overlaps picks name
also moved tool tip param default to tool_tip.xml
also made default param<const LLFontGL*> be SansSerif

reviewed by Leyla
2009-10-30 17:46:01 -07:00
Monroe Linden 123db56856 Initial pass at filling in the list in the nearby media floater. 2009-10-30 17:32:23 -07:00
Rick Pasetto 9abcf6684e Add implementation for adding and removing items to and from the nearby media list scroll control 2009-10-30 16:08:49 -07:00
Rick Pasetto c54faf2823 Fix crash in LLMultiFloater::setCanResize()
Reviewed (conceptually) by Richard and James
2009-10-30 16:01:58 -07:00
Erica 8518ac3e29 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-30 15:38:59 -07:00
Erica b4ef9d2ab5 EXT-2046 Add You are Here and For Sale icons 2009-10-30 15:38:39 -07:00
Monroe Linden 1fbacbaa9a Partial implementation of LLFloaterNearbyMedia::refreshList(), with many TODO sections and a bit of ifdef-ed out pseudocode.
Initial pass at LLViewerMediaImpl::getProximity().  Currently it just returns the position in the priority list, but that will change.
2009-10-30 14:52:33 -07:00
Erica 494b07668b Add Inventory Look folder (open / closed) and Generic Object art EXT-2042 2009-10-30 14:38:48 -07:00
Monroe Linden d6363c6c7a Fixed a couple problems with getPriorityList(). 2009-10-30 14:07:23 -07:00
Eric M. Tulla (BigPapi) a326a4e126 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-30 17:57:11 -04:00
Eric M. Tulla (BigPapi) 597d80fff5 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-30 17:55:15 -04:00
James Cook 1de55a5870 merge 2009-10-30 17:54:52 -04:00
James Cook 59c6dc7ed6 Floaters can be resized again - fix for regression introduced yesterday by me.
Floater drag handle visibility/enablement was getting lost during construction.
Reviewed with Richard.
2009-10-30 17:54:22 -04:00
Justin C. Rounds (Chuck) 4aee82ad98 Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-30 17:49:57 -04:00
Justin C. Rounds (Chuck) d34c8d6337 Made MapAvatarFriendColor Yellow (and added Yellow to color list).
https://jira.secondlife.com/browse/EXT-2006
2009-10-30 17:49:00 -04:00
Eric M. Tulla (BigPapi) daacf704ad Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-10-30 17:46:03 -04:00
Eric M. Tulla (BigPapi) 346458e811 Fix for EXT-1817. Tattoos now default to transparent.
Old behavior was setting your skin to white, since they were defaulting to the blank texture.
-Reviewed by nyx
2009-10-30 17:45:16 -04:00
James Cook c6c9064273 EXT-1565 Menu bar clock now shows Pacific (PDT/PST) time, as does any other
UI widget that references "slt" in the XML.
2009-10-30 16:37:39 -04:00
Monroe Linden 130fe8184d Fix a couple other build issues with my previous commit. 2009-10-30 12:48:44 -07:00
Monroe Linden b6df544fc0 Fix for typo in my last commit. 2009-10-30 12:38:07 -07:00
Monroe Linden 043d2d1f9d Hooks for the "nearby media" UI.
Added LLViewerMediaImpl::set/getDisabled(), which will prevent a media instance from loading.

Added LLViewerMedia::set/getInWorldMediaDisabled(), which will disable all inworld media fom loading.

Added LLViewerMedia::getPriorityList() and made the priority comparitor public.
2009-10-30 12:33:25 -07:00
callum a98591802a Merge 2009-10-30 12:56:14 -07:00
callum 5702da187d Implementation for DEV-41993
Mutes media on preview widget in media settings/general panel
2009-10-30 12:53:13 -07:00
Steve Bennetts 4cd8311522 merge 2009-10-30 12:41:36 -07:00
Rick Pasetto 71993b14d1 merge with remote repo 2009-10-30 12:05:35 -07:00
Rick Pasetto e5f6f063c1 DEV-41705 - introduce new floater for nearby media based on Brian's design 2009-10-30 12:05:11 -07:00
Steve Bennetts 922a05c1fe merge 2009-10-30 12:03:47 -07:00
richard fd1e10a4ca merge 2009-10-30 11:45:27 -07:00
richard 0d9682113d EXT-1980 - Bottom bar buttons retain highlight
EXT-1936 - [BSI] Reversion - clicking on avatar name in group chat should bring up profile
also fixed buttons not working on avatar list in IM window

reviewed by Leyla
2009-10-30 11:43:45 -07:00
James Cook 31eac6e0ee merge 2009-10-30 11:37:36 -07:00
James Cook b444964952 EXT-1962 Back button drop down menu now aligns to button.
LLNavigationBar was passing coordinates to LLMenuGL::showPopup() in the wrong
coordinate frame.  Added comments to LLMenuGL to clarify which coordinate
frame to use.  Not reviewed.
2009-10-30 11:37:16 -07:00
callum efd8e587c0 Merge 2009-10-30 10:49:45 -07:00
callum 91b54876b7 Adds an example plugin and corresponding changes to
LLMediaPluginTest test app. We do not copy over the
example plugin to the Second Life client plugin dir.
2009-10-30 10:48:10 -07:00
James Cook 4f29a87172 merge 2009-10-30 10:21:28 -07:00
James Cook 391535a513 Kill unneeded borders in movement controls.
Eliminated unneeded minimize button.
Not reviewed.
2009-10-30 10:21:09 -07:00
Justin C. Rounds (Chuck) 67e7a12720 Added graphic from 80/20.
http://jira.secondlife.com/browse/EXT-1530
2009-10-30 12:51:25 -04:00
Steve Bennetts 6324cf82f2 Merge hg.aws.productengine.com/secondlife/viewer-2-0/ revs 3836-3849 2009-10-30 09:42:04 -07:00
Vadim Savchuk b2526cde23 merge from default branch
--HG--
branch : product-engine
2009-10-30 19:17:53 +02:00