summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-22Fix assert in lldictionary as used by llfoldertypeRick Pasetto
Review #88 This assert might be valid in general, but LLFolderType has a valid reason for getting "not found"
2010-01-22PARTIAL FIX EXT-3491: only bring up "external browser"notification if target ↵Rick Pasetto
is external or pref is set Review #86 This changes the logic to bring up the notification "Do you want to open your Web browser to view this content?" only if either the target is _external, or the user pref says to. Otherwise it avoids the notification.
2010-01-22DEV-43688 fix a couple of formatting issues on strings in the localized ↵Ramzi Linden
languages related to Localization Cycle 2.
2010-01-22merge.Tofu Linden
2010-01-22automated merge viewer2.0->viewer2.0Loren Shih
2010-01-22EXT-4654 : FolderDictionary assert on importFileLoren Shih
Took out spurious assert; this should be a llwarns instead, and we should be warning when an illegal folder entry is created.
2010-01-22EXT-4492 : Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
EXT-4660 : Can delete a bodypart from the COF through inventory view or WEARING tab delete key EXT-4662 : remove leading separator from COF right-click menu EXT-4633 : AppearanceSP trash button doesn't update enabled state correctly Bunch of UI fixes related to the trash/delete functionality in InventoryFloater/SP and AppearanceSP "WEARING" tab. The main idea is that we don't want to allow deletion of bodyparts and folder links from the COF by the user.
2010-01-22PE merge.Tofu Linden
2010-01-22No ticket, Includes cleanup. Spaces cleanup.Sergei Litovchuk
--HG-- branch : product-engine
2010-01-22Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-01-22Fixed (EXT-4589) 'About Land' floater loose information after user quit ↵Sergei Litovchuk
Place Profile - Fixed Places panel not to remove parcel selection when it is used by "About Land" floater. --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4582 ([BSI] "Report" from avatar inspector does not ↵Vadim Savchuk
auto-populate "Abuser name" when Resident is not nearby). Added method LLFloaterReporter::showFromAvatar() to use for remote avatars. --HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4497 - Edit Profile and Edit Appearance buttons layout ↵Dmitry Zaporozhan
issue in side panel. --HG-- branch : product-engine
2010-01-22DEV-1195 SVC-580: ATTACH_LPEC / ATTACH_RPEC reversedSoft Linden
2010-01-22Fixed low bug EXT-4306 - Landmark name is shown with prefix in the group ↵Dmitry Zaporozhan
notice attachment. --HG-- branch : product-engine
2010-01-22fixed low bug EXT-4594 Highlight landmark on right mouse click in the ↵Denis Serdjuk
Favorites Bar --HG-- branch : product-engine
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22mergeIgor Borovkov
--HG-- branch : product-engine
2010-01-22implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one fileIgor Borovkov
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt] ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt * for incoming ad-hoc sessions, chat history of each session is saved into a separate file: format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt] ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from ↵Vadim Savchuk
Inventory floater doesn't trigger "save" button to become active). Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that the widget gets dirty only on DnD or when the OK button is pressed in the picker. This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button. --HG-- branch : product-engine
2010-01-22EXT-4492 Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
Revert removal of "delete" option from last checkin. Now enabling "delete" but checking if *this was deleted within removeItem().
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22Related to normal task EXT-2214 Refactor IM Control Panels & EXT-3434 (There ↵Mike Antipov
is no difference between invited and left participants in a Group call (Voice Controls)) -- replaced functionality to delayed removing of has left voice partcipants in VCP with one implemented in changeset f48e7cc41501 Behaviour of VCP implemented in EXT-3434 was not changed --HG-- branch : product-engine
2010-01-22mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-22fix for normal EXT-4549 [BSI] assigned group roles text appears selectable ↵Ychebotarev ProductEngine
when it should not --HG-- branch : product-engine
2010-01-22mergeVadim Savchuk
--HG-- branch : product-engine
2010-01-22Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-01-22mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-22fix for normal EXT-4554 [BSI] group join now button goes missing after ↵Ychebotarev ProductEngine
failure to join due to maximum groups --HG-- branch : product-engine
2010-01-22Work on normal task EXT-2214 Refactor IM Control PanelsMike Antipov
-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat) --HG-- branch : product-engine
2010-01-22Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2010-01-22made LLTransientFloaterMgr constructor protected;Alexei Arabadji
--HG-- branch : product-engine
2010-01-22Work on normal task EXT-2214 Refactor IM Control PanelsMike Antipov
-- replaced functionality to remove speacker from the list via Event timer. -- removed calling of LLSpeakerMgr::update from LLPanelGroupControlPanel::draw() (group text chat) For now list is updated when it is need. --HG-- branch : product-engine
2010-01-22additional fix for EXT-4035 Old sidepanel tab's text remains highlighted ↵Ychebotarev ProductEngine
when switching to inventory sidepanel tab --HG-- branch : product-engine
2010-01-22win build fixedAlexei Arabadji
--HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4321 - Pop-up window with description doesn't appear if ↵Dmitry Zaporozhan
choose 'Copy SLUrl' from 'Favorites Bar' context menu. --HG-- branch : product-engine
2010-01-22fix for EXT-4540 [BSI] console flood & freeze on sorting group member ↵Ychebotarev ProductEngine
listing by role & online status and few additional fixes... LLScrollListItem->getValue() doesn't contain LLUUID anymore also fix xml - no icons in Allowed Abilities --HG-- branch : product-engine
2010-01-22Fixed low bug EXT-4596 - '99' number is displayed if there are more than 99 ↵Dmitry Zaporozhan
active notifications. --HG-- branch : product-engine
2010-01-22fixed EXT-3670 “Clicking on IM session in IM session well closes IM ↵Alexei Arabadji
floater”, implemented exclude sets for groups of transient floaters, now transient floaters not closes if user click on view from global exclude set or from floater group set; made IM floater goes foreground if it visible but not focused instead hide floater; --HG-- branch : product-engine
2010-01-22Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a ↵Mike Antipov
Resident from ur Friends list :( - removed separate logic for Residents in the Friends list when Calling card is removed --HG-- branch : product-engine
2010-01-22fixed EXT-4529 [BSI] X in tabbed Instant Message functions as a minimize -Igor Borovkov
--HG-- branch : product-engine
2010-01-21mergeRick Pasetto
2010-01-21Automated merge with ssh://richard@hg.lindenlab.com/james/gooeyRick Pasetto
2010-01-21EXT-4492 Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
Removed "delete" from the COF menu, since it is normally disabled from the inventory view.
2010-01-21Merge.Tofu Linden
2010-01-21Fix inverted logic from review.Tofu Linden
2010-01-21another fix.Leyla Farazha