Commit Graph

299 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 1ec47c39a6 EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot instead of passing it along everywhere such as in performAction
mRoot is now stored for all LLInventoryBridge types.
Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01 17:50:48 -04:00
Loren Shih 5372782d50 EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView *rootFolder"
Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01 14:29:23 -04:00
Loren Shih d4fef262bc EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionary
Took out some ugly case statements and stuck those functions into the asset dictionary instead.  This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement).
2010-03-31 12:05:51 -04:00
Loren Shih d99a7d2f1d automated merge 2010-03-30 17:47:16 -04:00
Loren Shih d7002c0695 EXT-3529 : INFRASTRUCTURE : Move LLFindWearables code and others into LLInventoryFunctions
These functions are defined in LLInventoryFunctions.h but their implementation is in LLInventoryBridge...  moved everything to LLInventoryFunctions.
2010-03-30 16:24:18 -04:00
Nyx (Neal Orman) cc3f4c1f59 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-30 15:20:37 -04:00
Nyx (Neal Orman) dbcd12a4d1 EXT-6633 enable basic multiwearables demo
Fixed several areas of code that were not multi-wearables enabled.
Specifically allowed for the wearing of created outfits that had links to
multiple items of the same type. Such outfits can be created by dragging
multiple items of the same type into an unworn outfit folder. When you
wear the outfit, all items (up to 5 per type) should be worn. Does not
affect right-click options or other buttons.

Code reviewed by Vir.
2010-03-30 15:17:14 -04:00
Loren Shih 5861a2faf2 EXT-3414 : Move static backgroundfetch methods and variables to llinventorymodel subclass
Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-03-30 11:49:15 -04:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Brad Payne (Vir Linden) 783eb286a6 merge 2010-03-29 10:53:22 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Loren Shih 0bcfbde3a4 EXT-6536 : Make LLVOAvatarSelf a singleton
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Brad Payne (Vir Linden) 7792a53b28 cleanup - replaced larger chunk of code with removeCOFItemLinks 2010-03-19 16:44:50 -04:00
Brad Payne (Vir Linden) 3979bf6cae cleanup - replaced larger chunk of code with removeCOFItemLinks 2010-03-19 16:06:42 -04:00
Dmitry Zaporozhan 00c4dabc2b Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in inventory.
Added new icon for multi-objects.
New icon is used in inventory, object inventory and buy floater.
New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply.

--HG--
branch : product-engine
2010-03-18 17:32:44 +02:00
Paul Guslisty 69491cccae Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My Appearance > Wearing tab - where it's linked description)
- Replaced hardcoded '(active)' string with [GESLABEL] arg. <string name=\"ActiveGesture\" value=\"[GESLABEL] (TRANSLATION OF 'active')\"/> - this line with translation should be added to the rest locales

- Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/

--HG--
branch : product-engine
2010-03-17 14:40:50 +02:00
Loren Shih 43f1abee2b EXT-6367: Can't delete non-links from COF
EXT-6372 : Can waer non-links in COF

Some minor changes to account for non-link items appearing in the COF (non-links shouldn't appear in COF, but this can happen due to bugs or 1.23 usage).
First fix allows for these items to be deleted.
Second fix ignores these items from being processed/worn.
2010-03-15 17:43:17 -04:00
Mike Antipov 671118638f Fixed major bug EXT-5308 (right click - Copy Asset UUID, copies null key to clipboard.)
- disabled "Copy Asset UUID" menu item for Inventory items w/o known assets.

--HG--
branch : product-engine
2010-03-01 14:31:06 +02:00
Tofu Linden 213ff5a4e0 EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.
If you're reading this message, this was reviewed by Soft, Nyx or Aura. :)
2010-02-26 19:23:42 +00:00
Brad Payne (Vir Linden) 00fdc0acd5 Work in progress on EXT-5333: Cleanup. 2010-02-22 14:03:29 -05:00
Tofu Linden ed116da131 DEV-33767 VWR-13897: Deleting multiple open animations crashes the viewer
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-15 16:48:41 +00:00
Tofu Linden 0cf46fe136 CID-144
Checker: NULL_RETURNS
Function: LLInvFVBridgeAction::doAction(const LLUUID &, LLInventoryModel *)
File: /indra/newview/llinventorybridge.cpp
2010-02-13 13:43:33 +00:00
Tofu Linden 4fa10e3596 CID-427
Checker: FORWARD_NULL
Function: LLFolderBridge::pasteFromClipboard()
File: /indra/newview/llinventorybridge.cpp
2010-02-12 17:38:19 +00:00
Tofu Linden 1fcc26d570 CID-141
Checker: NULL_RETURNS
Function: LLFolderBridge::folderOptionsMenu()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:35:29 +00:00
Tofu Linden 3aa6150e80 CID-142
Checker: NULL_RETURNS
Function: LLFolderBridge::determineFolderType()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:33:21 +00:00
Tofu Linden 284cab7f0f CID-82
Checker: FORWARD_NULL
Function: LLFolderBridge::pasteFromClipboard()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:01:46 +00:00
Tofu Linden 6e73357a86 CID-88
Checker: FORWARD_NULL
Function: LLItemBridge::restoreToWorld()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 17:48:03 +00:00
Tofu Linden ed26b11f68 CID-89
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-10 17:45:50 +00:00
Tofu Linden 5707b71d09 CID-90
Checker: FORWARD_NULL
Function: LLCallingCardBridge::buildContextMenu(LLMenuGL &, unsigned int)
File: /indra/newview/llinventorybridge.cpp
2010-02-10 17:44:18 +00:00
Tofu Linden 797823f600 CID-422
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-10 17:18:10 +00:00
Loren Shih e180c5f204 EXT-4602 : Copying folders doesn't work
Folders are back to being no longer copyable.
2010-02-09 21:21:11 -05:00
Loren Shih 295843ee36 EXT-4984 : Dragging an object out of the COF manually does not unwear that item
One-line change to forbid dragging items out of the COF.
Also added some cosmetic cleanup (some whitespace cleanup, const, etc.)
2010-02-05 18:38:40 -05:00
Loren Shih 663aa82831 EXT-4618 : Pasting an item into the COF folder creates a copy of the item, 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-05 13:38:52 -05:00
Loren Shih a05766c200 automated merge viewer2.0->viewer2.0 2010-02-04 19:04:03 -05:00
Loren Shih 14d77a36d4 EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it worn
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-04 18:38:47 -05:00
Loren Shih c25915b39e EXT-4990 : "Remove Link" and "Delete" are both active for links in the InventoryFloater
For links, removed "Delete", since having both "Remove Link" and "Delete" is redundant.
2010-02-04 17:21:21 -05:00
Loren Shih 643b014fb8 EXT-4990 : "Find Original" should be enabled for links in the trash
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-04 16:43:46 -05:00
Brad Payne (Vir Linden) 2b5a3de809 merge 2010-02-04 16:23:24 -05:00
Brad Payne (Vir Linden) a165279acd EXT-4902: Assert crash after detaching all and removing all clothes. 2010-02-04 16:20:43 -05:00
Brad Payne (Vir Linden) 973e2143d2 EXT-4902: Assert crash after detaching all and removing all clothes. Turned overzealous assert into a warning. 2010-02-04 15:22:39 -05:00
Loren Shih c58e152236 EXT-4801 : hitting trash button for trashed items does not delete item
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-04 14:29:43 -05:00
Loren Shih f700be39e7 EXT-4901 : Context menu missing on Scripts and Notecards in Trash
Simple string naming error.
2010-02-03 21:55:18 -05:00
Loren Shih f5ade203cb EXT-4930 : Remove ability to change folder type in release viewer2.0
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-03 16:56:25 -05:00
Dmitry Zaporozhan c679ae3546 Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in Inventory side panel.
--HG--
branch : product-engine
2010-02-01 17:11:31 +02:00
Loren Shih f0ee8af8ae EXT-4816 : Fix coverty whine on break statement fallthrough
Can't fix the whine, but added a comment that the fallthrough is deliberate.
2010-02-01 13:46:22 -05:00
Mike Antipov 8a7ca61479 Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up 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-29 13:05:11 +02:00
Tofu Linden efe8b578db merge. 2010-01-22 12:21:59 -08:00
Loren Shih 3b0ba0c2d7 automated merge viewer2.0->viewer2.0 2010-01-22 14:55:39 -05:00
Loren Shih 0283837e56 EXT-4492 : Deleting gestures from the wearing tab causes the viewer to crash
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-22 14:44:32 -05:00
Tofu Linden 3889d43299 PE merge. 2010-01-22 10:51:58 -08:00
Loren Shih c64638dc21 EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
Revert removal of "delete" option from last checkin.
Now enabling "delete" but checking if *this was deleted within removeItem().
2010-01-22 10:48:24 -05:00
Mike Antipov 4230c65548 Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a 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-22 13:17:58 +02:00
Rick Pasetto dc47f52e9f merge 2010-01-21 18:40:37 -08:00
Loren Shih af2f61af50 EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
Removed "delete" from the COF menu, since it is normally disabled from the inventory view.
2010-01-21 20:34:10 -05:00
angela 52baeb34b3 EXT-4269 PDD: Add teleport destination to teleport warning dialog 2010-01-19 11:06:17 +08:00
Mike Antipov 6e67ac5e02 Fixed low bug EXT-4311 (Order of items in 'Favorites Bar' folder remains non-changed if change its order in the 'Favorites Bar')
-- reason: there was two places where identical resorting of Favorite landmarks functionality was implemented: InventoryBridge & Favorite bar.
    It was not impelnmented properly in favorites bar: LLInventoryObserver::SORT flag was not set after d-n-d.
-- fix: moved identical functionality to update & save order of Favorite landmarks from these places to Inventory Panel

--HG--
branch : product-engine
2010-01-15 18:02:42 +02:00
Mike Antipov c3c0b5ed47 Fixed normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- added LLInventoryCallback to rearrange favorite landmarks properly after new on is added.

--HG--
branch : product-engine
2010-01-15 20:18:22 +02:00
Mike Antipov 06838dfd57 Work on normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- refactoring: move functionality to rearange Favorite landmarks from Inventory Folder bridge to Inventory model
-- improved logic to place dragged landmark before target one.

--HG--
branch : product-engine
2010-01-15 19:56:37 +02:00
Loren Shih 04f1a83b2e EXT-3955 : [ AppearanceSP ] "Add to Current Outfit" confusing for outfits, remove it
Removed "Add to Current Outfit" from right-click outfits context menu.
2010-01-14 19:44:07 -05:00
Loren Shih d9b8307786 automated merge viewer2.0->viewer2.0 2010-01-08 16:33:43 -05:00
Loren Shih a2d4b740ed EXT-4089 : InventorySP File->Open doesn't open folders.
Includes some minor const correctness infrastructure changes.
2010-01-08 12:34:10 -05:00
richard 3a0b948bb3 merge 2010-01-07 18:38:28 -08:00
Brad Payne (Vir Linden) e55193cf85 For EXT-4030: Can delete the outfit folder that you're wearing in My Outfits 2010-01-07 14:55:49 -05:00
richard e28eac929b EXT-4014 - Inventory folders should use "open" folder art...
reviewed by Leyla
2010-01-06 16:17:27 -08:00
Brad Payne (Vir Linden) 5c8b2deb82 For EXT-3622: Take off item, wear a different item --> first item is put on again. Fixed the 'remove all clothing' case. 2009-12-23 15:15:49 -05:00
Brad Payne (Vir Linden) 55c1f18c8d For EXT-3622: Take off item, wear a different item --> first item is put on again 2009-12-22 16:41:21 -05:00
Loren Shih 36634bc1ec automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-17 18:55:01 -05:00
Loren Shih 03c75c22f9 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
"Delete" no longer works for system folders.
Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected.

--HG--
branch : avatar-pipeline
2009-12-17 18:47:58 -05:00
Loren Shih d3d454988a EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items in the folder
Now checking contents of the folder for any actively worn items for determining this flag.

--HG--
branch : avatar-pipeline
2009-12-17 15:47:07 -05:00
Mike Antipov e0855e5249 Fixed major bug EXT-3498 (Sorting not working correctly in Favorites Bar)
- added sorting of Favorites items before reordering

--HG--
branch : product-engine
2009-12-17 18:34:50 +02:00
Loren Shih d2abd1779a EXT-3527 : Centralize calls to getIsItemWorn
Changed more functions to use get_is_item_worn.

--HG--
branch : avatar-pipeline
2009-12-16 18:21:37 -05:00
Loren Shih 95bbee6b0e EXT-3527 : Centralize calls to getIsItemWorn
Changed more functions to use get_is_item_worn.

--HG--
branch : avatar-pipeline
2009-12-16 17:02:02 -05:00
Loren Shih 7796fc6748 EXT-3527 : Centralize calls to getIsItemWorn
Moved function from llinventorybridge to llinventoryfunctions.

--HG--
branch : avatar-pipeline
2009-12-16 16:36:40 -05:00
Loren Shih 66e7ca7c7a EXT-2524 : Disable ability to make links manually in non-god mode
Non-god mode treatment of copy/paste is now consistent with 1.23 behavior, and "paste as linK" doesn't show up in non-god mode.

--HG--
branch : avatar-pipeline
2009-12-16 16:11:53 -05:00
Loren Shih f87dcc28fa EXT-2760 : Double-clicking an Object in inventory opens the permissions in the side tray
Double clicking on an object no longer brings up both the floater and sidetray (it only brings up the sidetray now).

--HG--
branch : avatar-pipeline
2009-12-16 13:53:19 -05:00
Loren Shih 4d4406820b automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:17:30 -05:00
Loren Shih a162d6afda EXT-3304 : Can't reorder items in the Favorites accordions
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established.

--HG--
branch : avatar-pipeline
2009-12-15 19:16:42 -05:00
Brad Payne (Vir Linden) 2dd09062d1 menu separator fix
--HG--
branch : avatar-pipeline
2009-12-15 17:33:59 -05:00
Loren Shih fbf5d1a992 EXT-3304 : Can't reorder items in the Favorites accordions
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP
EXT-1916 : Landmarks are not sorted in the Favorites Accordion

Added a new LLInventoryObserver::SORT request for resorting folder contents.
Landmarks no longer use the same sorting as accordions.

--HG--
branch : avatar-pipeline
2009-12-15 13:47:31 -05:00
Nyx (Neal Orman) 4cc5f81ddf EXT-3370 integrate tab-ification to appearance sidepanel
Moved elements around so that the bottom bar is contained in the outfits panel
XUI changes by erica/chuck/nyx
code changes by nyx

code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-14 17:17:40 -05:00
Brad Payne (Vir Linden) b8ac919d6f merge
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
Brad Payne (Vir Linden) ae8c1d1ea8 For EXT-3264: Missing separators in inventory context menus - restore
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
Loren Shih 99590047eb automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
Eric M. Tulla (BigPapi) 1f3a554709 Minor gcc compile fix
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
Eric M. Tulla (BigPapi) f042f35381 Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
Brad Payne (Vir Linden) 264446a5ce For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 19:35:58 -05:00
Brad Payne (Vir Linden) b131314dba Fix for r. click Edit on a link to wearable
--HG--
branch : avatar-pipeline
2009-12-10 18:39:44 -05:00
Brad Payne (Vir Linden) e7ef47e825 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 18:19:23 -05:00
Eric M. Tulla (BigPapi) 9db47b1d4b Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms 2009-12-10 16:07:54 -05:00
Brad Payne (Vir Linden) 6af53dd7e2 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 15:31:08 -05:00
Loren Shih ca56ac2179 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
--HG--
branch : avatar-pipeline
2009-12-10 15:11:02 -05:00
Brad Payne (Vir Linden) 50a865e212 merge
--HG--
branch : avatar-pipeline
2009-12-09 19:15:30 -05:00