summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
AgeCommit message (Collapse)Author
2011-01-07Automated merge up from viewer-developmentLoren Shih
2010-12-29SOCIAL-405 FIX Always make Web profiles open in internal Web content floater ↵callum
regardless of prefs
2010-12-07more merge from viewer-developmentBrad Payne (Vir Linden)
2010-12-07merge viewer-development into web-profilesBrad Payne (Vir Linden)
2010-10-20SOCIAL-84, SOCIAL-85 WIPBrad Payne (Vir Linden)
2010-10-18consolidate generating profile URL, force to lower caseBrad Payne (Vir Linden)
2010-10-12Initial hooks for web profiles supportBrad Payne (Vir Linden)
2010-09-29MergeLeyla Farazha
2010-09-28STORM-248 FIXED The 'Share' button in My Inventory now respects multiple ↵Vadim ProductEngine
selection. - The button is now enabled only if all selected items are shareable. (it had checked only one currently selected item) - Eliminated some copy&paste.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-22EXT-8248 FIXED Can't teleport multiple friendsAimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-21EXT-8245 FIXED Added passing inventory panel to give_inventory_cb callback ↵Sergei Litovchuk
when called from 'Add More' panel. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/737/. --HG-- branch : product-engine
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-08EXT-8245 FIXED Fixed passing inventory panel to floater Resident Chooser ↵Sergei Litovchuk
when called from 'Add More' panel. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/709/. --HG-- branch : product-engine
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided ↵Alexei Arabadji
logging of 'item shared' message instead of spawning IM session and add message to it. Details: 1 Corrected 'ItemsShared' notification message. 2 Avoided spawning session on item shared event. 3 Provided logging of item shared message. 4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/ --HG-- branch : product-engine
2010-06-04Reverting commenting out of code since fix is inLeyla Farazha
2010-06-04MergeLeyla Farazha
2010-06-04Comment out code that won't compile, fix laterJames Cook
2010-06-09EXT-6710 FIXED Updated inventory items sharing behavior according to ↵Alexei Arabadji
comments: "Andrey ProductEngine added a comment - 02/Jun/10 03:21 AM" and "Grumpity ProductEngine added a comment - 02/Jun/10 03:25 AM" of EXT-6710 issue. 1 Reused 'ShareNotification' with updated message. 2 Made allert message box scrollable(done by Yuri Chebotarev). 3 Updated word words_separator in strings.xml. 4 Made friends list tab of avatar picker be opened on 'share with avatar' action. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/525/ --HG-- branch : product-engine
2010-06-03LLAvatarActions merge fixLeyla Farazha
2010-06-03mergeRichard Linden
2010-06-02removed "SESSION_NAME" in favor of doing a gCacheName lookupLeyla Farazha
reviewed by James
2010-06-01EXT-6710 FIXED Added inventory items sharing confirmation and modified alert ↵Alexei Arabadji
about non-copy objects sharing. Current behavior: * user will be prompted about sharing items regardless is it one or more items; * user will be prompted about trying to share one ore more non-copy items; * in case user tries to share non-copy items among with copy items — copy tems will be shared and user will be prompted about sharing non-copy items reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/ --HG-- branch : product-engine
2010-05-28Getting rid of some more old gCacheName callsLeyla Farazha
2010-05-28removing deprecated add friend callback path for server 1.24Leyla Farazha
2010-05-25fixed merge problemLeyla Farazha
2010-05-24mergeRichard Nelson
2010-05-21Rename LLAvatarName::getNameAndSLID() to getCompleteName()James Cook
Discussed with Leyla/Richard
2010-05-21EXT-6710 FIXED Implemented functionality to give multiselected inventory ↵Mike Antipov
items to several selected avatars in avatar picker: 1. Select items to share 2. Click Share; Resident chooser opens 3. Select residents to share with, click SELECT 4. Selected items are transferred to selected users 5. Pop-up toast confirms transfer Some implementation notes: * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars) * Select button is enableв if all selected items can be offered. * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/ --HG-- branch : product-engine
2010-05-13Fix build errors introduced in last mergeJames Cook
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-12DEV-50013 IM window titles use correct name lookup methodJames Cook
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-04-19automated merge with trunkRoxie Linden
2010-04-12Implemented major task EXT-6710(Feature request: Allow drag and drop from ↵Eugene Mutavchi
Inventory panel to Resident Picker) - added handling the drag add drop inventory items to resident picker - added "Share" verb button to the inventory panel which opens resident picker - added "Share" menu item to the individual inventory context menu which acts as verb button Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/215/ --HG-- branch : product-engine
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-03-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-25Fixed low bug EXT-6488 (Teleport menuitem is enabled for offline residents ↵Paul Guslisty
in the context menu and inspectors) - Added a check for a teleport offer ability. In XML created a paremeter and check it in source code. Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/86/ --HG-- branch : product-engine
2010-03-22fixed EXT-6476 (waiting).txt chat log file with "(waiting)" instead of ↵Igor Borovkov
avatar name gets created when Offering Teleport from Search Floater offer teleport action is put on hold until Name Cache gets updated with appropriate avatar name --HG-- branch : product-engine
2010-03-08Merge with viewer 2 beta 4James Cook
2010-02-22Fixed low bug (EXT-5136) Add the "Map" item to the people context menu.Sergei Litovchuk
--HG-- branch : product-engine
2010-02-19IM window titles are Display Name (SLID)James Cook
2010-02-11MergeJames Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 16:19:10 +0000