summaryrefslogtreecommitdiff
path: root/indra/newview/lltooldraganddrop.cpp
AgeCommit message (Collapse)Author
2010-06-07Merge with render-pipelineDave Parks
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
Resident-submitted patch, cleaned up so it matches style and compiles/builds well. Appears to work for stated goals but will need some more UI work to ensure consistency. WIP checkin, will be code reviewed before pushing.
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-21EXT-6710 WIP Prepare to implementation - "Give inventory" related ↵Mike Antipov
functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory. To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it. No functionality should be changed. LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones. There were moved methods related to: - give inventory item - give inventory category - log into chat Such functionality was moved: - is give acceptable - do inventory give operation - send give inventory request to server - process give inventory for protected items QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/ --HG-- branch : product-engine
2010-04-14slightly hairy merge from viewer-trunkTofu Linden
2010-04-07EXT-6745 : Refactor LLFetchComboObserver to use LLFetchItems and ↵Loren Shih
LLFetchDescedents instead of code duplication Took out a bunch of code duplication from the FetchComboObserver and am using the LLFetchItems/DescendentsObservers instead. Also added some comments and made some minor superficial cleanup to LLInventoryObserver done().
2010-04-07EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Minor cleanup of LLInventoryFetchComboObserver
2010-04-06EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit. Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically FetchObservers now take in a list of IDs to check against. Made some naming changes.
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06un-hairy merge from viewer-trunkTofu Linden
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02merge from viewer-trunkTofu Linden
2010-03-31merge from viewer-trunkTofu Linden
2010-03-30EXT-6525 - drag threshold is very low for navbar favoritesRichard Nelson
reviewed by Leyla
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
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-29MergeLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29For EXT-4666: changed LLGestureManager to LLGestureMgr throughoutBrad Payne (Vir Linden)
2010-03-29For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughoutBrad Payne (Vir Linden)
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Lots of superficial cleanup, particularly around "if (" formatting. Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-25automated mergeLoren Shih
2010-03-25EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-20mergeDave Parks
2010-03-18Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).Andrew Dyukov
- Removed unnecessary string in strings.xml and substituted it in code with existing one. --HG-- branch : product-engine
2010-03-12Fixed reopened normal sub-task EXT-5950 (Do not spawn IM chiclet for "drop ↵Andrew Dyukov
on avatar" inventory offers). - Added logging of "Inventory item offered" message when dnd'ing item on avatar via new LLToolDragAndDrop::logInventoryOffer() method. --HG-- branch : product-engine
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-197Tofu Linden
Checker: RESOURCE_LEAK Function: LLToolDragAndDrop::giveInventoryCategory(const LLUUID &, LLInventoryCategory *, const LLUUID &) File: /indra/newview/lltooldraganddrop.cpp
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-13drag-and-drop mesh asset onto in-world objectKarl Stiefvater (qarl)
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-07Fixing merge borkasaurs.Palmer
2009-12-07Merge of viewer 2 changesPalmer
2009-12-08Fixed major bug EXT-3191 (Crash after dragging inventory item to avatar or ↵Mike Antipov
IM floater) Reason: Null pointer to cargo data was passed from LLToolDragAndDrop::dragOrDrop in this case. Fix: added check against NULL of the LLToolDragAndDrop::locateInventory() result in the LLToolDragAndDrop::dragOrDrop(). The same checking presents in another place of the LLToolDragAndDrop::dragOrDrop(). Handling is interrupted in this case. Thanks Andrew ProductEngine for provided call stack --HG-- branch : product-engine
2009-12-01Fix Linux/Mac builds due to LLToolDragAndDrop member function pointersJames Cook
2009-12-01automated merge for viewer-2.0 -> avp.Loren Shih
--HG-- branch : avatar-pipeline
2009-12-01EXT-2964 : Can drag-and-drop a folder with links onto an objectLoren Shih
EXT-3012 : Cleanup LLToolDragAndDrop Now checking if folder contents have links before allowing object drop. Did some superficial cleanup of lltooldraganddrop files. --HG-- branch : avatar-pipeline
2009-11-30INFRASTRUCTURE: LLToolDragAndDrop cleanupLoren Shih
Includes removal of unused header files. Includes changing big static map into a lldictionary. --HG-- branch : avatar-pipeline
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames Cook
Fixed many more includes
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-12LLAppearanceManager cleanup - turning into proper singletonBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline