summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2010-02-22mergePalmer Truelson
2010-02-22Work in progress on EXT-5333: Cleanup.Brad Payne (Vir Linden)
2010-02-15viewer2 mergeTofu Linden
2010-02-15DEV-33767 VWR-13897: Deleting multiple open animations crashes the viewerTofu Linden
We were closing preview floaters while we were in the middle of assembling the MoveInventoryItem message. But closing an anim preview floater issues a AgentAnimation message to stop any playing animation previews. On resuming the MoveInventoryItem assembly, message system is in a rightly confused state. Made preview window closing happen before we start assembling the MoveInventoryItem message.
2010-02-13viewer2 trunk merge.Tofu Linden
2010-02-13CID-144Tofu Linden
Checker: NULL_RETURNS Function: LLInvFVBridgeAction::doAction(const LLUUID &, LLInventoryModel *) File: /indra/newview/llinventorybridge.cpp
2010-02-12viewer2 merge.Tofu Linden
2010-02-12CID-427Tofu Linden
Checker: FORWARD_NULL Function: LLFolderBridge::pasteFromClipboard() File: /indra/newview/llinventorybridge.cpp
2010-02-11merge.Tofu Linden
2010-02-10CID-141Tofu Linden
Checker: NULL_RETURNS Function: LLFolderBridge::folderOptionsMenu() File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-142Tofu Linden
Checker: NULL_RETURNS Function: LLFolderBridge::determineFolderType() File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-82Tofu Linden
Checker: FORWARD_NULL Function: LLFolderBridge::pasteFromClipboard() File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-88Tofu Linden
Checker: FORWARD_NULL Function: LLItemBridge::restoreToWorld() File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-89Tofu Linden
Checker: FORWARD_NULL Function: LLObjectBridge::performAction(LLFolderView *, LLInventoryModel *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>) File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-90Tofu Linden
Checker: FORWARD_NULL Function: LLCallingCardBridge::buildContextMenu(LLMenuGL &, unsigned int) File: /indra/newview/llinventorybridge.cpp
2010-02-10CID-422Tofu Linden
Checker: NULL_RETURNS Function: LLGestureBridge::performAction(LLFolderView *, LLInventoryModel *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>) File: /indra/newview/llinventorybridge.cpp
2010-02-10merge from viewer2 trunk.Tofu Linden
2010-02-09EXT-4602 : Copying folders doesn't workLoren Shih
Folders are back to being no longer copyable.
2010-02-09merge from viewer2 trunk.Tofu Linden
2010-02-08Merge from viewer2 trunk.Tofu Linden
2010-02-05EXT-4984 : Dragging an object out of the COF manually does not unwear that itemLoren Shih
One-line change to forbid dragging items out of the COF. Also added some cosmetic cleanup (some whitespace cleanup, const, etc.)
2010-02-05EXT-4618 : Pasting an item into the COF folder creates a copy of the item, ↵Loren Shih
not a link EXT-5018 : Automatically reject leading separators from right click menu Trivial fix to remove "paste" as an option from the COF. Also contains a partial fix for EXT-5018.
2010-02-05repair meshfu for inventory API changeTofu Linden
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04automated merge viewer2.0->viewer2.0Loren Shih
2010-02-04EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it wornLoren Shih
EXT-4997 : Centralize right-click menu options for delete/remove link EXT-4998 : Automatically reject double separators from right click menu Disabled/hid delete button from COF right-click menu, also means that trash icon is disabled. Added generalized function to remove consecutive separators from right-click menu. Made a minor cosmetic change to have all code duplication for adding "delete" menu item instead call a common function.
2010-02-04EXT-4990 : "Remove Link" and "Delete" are both active for links in the ↵Loren Shih
InventoryFloater For links, removed "Delete", since having both "Remove Link" and "Delete" is redundant.
2010-02-04EXT-4990 : "Find Original" should be enabled for links in the trashLoren Shih
EXT-4988 : Centralize right-click menu options when items are in trash This change is a lot less scary than it looks. There is a bit of minor cosmetic cleanup (e.g. typedefing a commonly-used vector), and I've eliminated code duplication since, previously, every item/listener type had its own purge/restore item dialog; these are now handled in one central function. I also moved "Find Original" above Purge/RestoreItem so that it appears first in the trash menu; this does not affect other menu options. The functionality change from this checkin is to enable "Find Original" for link items in the trash.
2010-02-04mergeBrad Payne (Vir Linden)
2010-02-04EXT-4902: Assert crash after detaching all and removing all clothes.Brad Payne (Vir Linden)
2010-02-04EXT-4902: Assert crash after detaching all and removing all clothes. Turned ↵Brad Payne (Vir Linden)
overzealous assert into a warning.
2010-02-04EXT-4801 : hitting trash button for trashed items does not delete itemLoren Shih
EXT-4957 : add const correctness for LLFolderViewEventListener::isItemRemovable This checkin affects several files but is a lot less scary than it looks. It's mostly to add const correctness, and to rename isInTrash to isItemInTrash so that its naming is consistent with isItemRemovable/isItemMovable. The only functionality change is to disable the trash button when an item is already in the trash.
2010-02-04merge from viewer2.Tofu Linden
2010-02-03EXT-4901 : Context menu missing on Scripts and Notecards in TrashLoren Shih
Simple string naming error.
2010-02-03EXT-4930 : Remove ability to change folder type in release viewer2.0Loren Shih
You should not be able to change folder type in viewer2.0; this was meant as a debug option and I swear it was removed some time ago and crept back in...
2010-02-03merge from viewer2.Tofu Linden
2010-02-01Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in Inventory ↵Dmitry Zaporozhan
side panel. --HG-- branch : product-engine
2010-02-01EXT-4816 : Fix coverty whine on break statement fallthroughLoren Shih
Can't fix the whine, but added a comment that the fallthrough is deliberate.
2010-01-29merge from viewer2Tofu Linden
2010-01-29Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up ↵Mike Antipov
with 1@ in Viewer 1.23.x) -- cleanup: removed deprecated code added for previous sollution to support custom sorting of favorite landmarks. For now previous implementation is removed, bug is FIXED. --HG-- branch : product-engine
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22merge.Tofu Linden
2010-01-22automated merge viewer2.0->viewer2.0Loren Shih
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-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-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-21mergeRick 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-20Merge from viewer2. Minor conflict resolved.Tofu Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:44:06 +0000