Commit Graph

101 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
simon@Simon-PC.lindenlab.com f199b298b4 MAINT-971 : [PUBLIC]Renaming a new inventory item while filtering item names
renames parent folder instead.   Reviewed by Kelly
2012-07-02 16:40:18 -07:00
Nat Goodspeed ee87fd975f DRTVWR-136: Remove redundant remove_(item|category)() functions.
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
2012-04-14 22:23:24 -04:00
Oz Linden a56424d078 fix merge conflict in remove_item 2012-04-13 20:57:52 -04:00
Oz Linden f79b775fcc merge changes for drtvwr-136 2012-04-13 20:55:47 -04:00
Nat Goodspeed fdd018783a CHOP-854: move change_(item|category)_parent() into LLInventoryModel.
It's not really clear why they're in llinventoryfunctions.{h,cpp} instead of
LLInventoryModel, and in fact LLInventoryModel::removeItem() already contains
code essentially cloned from change_item_parent() -- or perhaps vice-versa.
This changeset addresses only migrating the functions, and fixing up existing
references, to simplify code review.
2012-03-27 18:40:17 -04:00
Richard Linden b2085efa8b CHUI-68 FIX Using arrow keys to scroll through inventory folders does not scroll content in view
as a side effect, "My Inventory" is not selected by default
auto selection of filtered items now reliably turns itself off as soon as user scrolls or moves keyboard focus to inventory
2012-03-22 12:27:55 -07:00
Merov Linden 155a171180 EXP-1896 : Prevent recursively copying of folders onto themselves 2012-02-16 14:57:30 -08:00
Merov Linden 2a4aa438f5 EXP-1863 : Implemented cut, copy, paste for folders. Issues with folder filtering though. 2012-02-09 23:37:24 -08:00
Merov Linden 10dadc6b0d EXP-1873 : Move cut items to trash in cut/copy over cut situations. 2012-02-08 17:22:04 -08:00
Merov Linden db824cff75 EXP-1862 : Suppress LLInventoryClipboard, move its functions to the unified LLClipboard and use this only 2012-02-03 18:38:03 -08:00
Leslie Linden e4b63c96b8 EXP-1804 FIX -- Drag and drop operations can be blocked by modal dialogs
* Added support for marketplace notifications that don't display the dialog
  until the next frame, leaving room for the drag and drop operation to
  properly complete before the notification shows up and interferes.
2012-01-17 14:59:18 -08:00
Leslie Linden 577479a3e5 EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification. 2012-01-17 09:36:14 -08:00
Leslie Linden 6b919e324e EXP-1803 FIX -- Notify the user when a folder is automatically created for them in the outbox
* New confirmation dialog lets them know when a folder was automatically created to contain an item dragged/copied to the outbox.
2012-01-13 16:36:57 -08:00
Leslie Linden ba41aea4b2 EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* Any drag and drop or copy operation to the merchant outbox that contains one
  or more no-copy items now brings up a single modal dialog prompting the user
  to move the no-copy items to the outbox or to leave them all behind.
2012-01-12 17:01:23 -08:00
Leslie Linden 26998a5e38 EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to Merchant Outbox context menu option in Inventory
* Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater
* Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
2012-01-05 12:42:58 -08:00
Leslie Linden d7fabfee19 EXP-1715 FIX -- Merchant outbox drag and drop has offset between mouse position and selected folder
EXP-1717 FIX -- Drag and drop within the outbox can result in an item created at the top level of the outbox

Folders are now created for items dragged around within the merchant outbox if their drop target is the top level outbox inventory panel itself.
2011-12-13 13:56:41 -08:00
Leslie Linden 9fcdec3e34 EXP-1679 FIX -- Collapse links that are dragged to the outbox
* Links are automatically tracked back to their source when dragged to the outbox
* Worn items are now allowed into the outbox
2011-12-13 11:15:01 -08:00
Leslie Linden 0ff49e798c EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel.
* Renamed new inventory panel from "my_inventory" to "inventory"

Reviewed by Richard.
2011-10-17 15:18:19 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Seth ProductEngine 0f3221e25d EXP-1225 FIXED Added a floater for My Inventory side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
- Added LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.
2011-09-27 21:05:05 +03:00
leslie@leslie-HPz600.lindenlab.com f1c01becf2 EXP-857 PROGRESS -- Add context menu entries as alternate path to populate outbox
* Folders containing items being worn now have the "Copy to Marketplace" context
  menu item disabled.
2011-08-30 16:18:34 -07:00
Leyla Farazha 2d4d7e7ca3 EXP-1093 User can place multiple copies of a no-copy item in merchant outbox to sell and can cause viewer to crash 2011-08-16 15:58:34 -07:00
Leyla Farazha 6f7132ca77 deleting folders after no-copy move to outbox 2011-08-15 09:53:26 -07:00
Leyla Farazha e69efc8369 EXP-843 Enable drag and drop from the outbox
EXP-1036 Disable most inventory functionality for the outbox view
2011-08-12 10:39:35 -07:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Seth ProductEngine 7f53c0934a STORM-28 FIXED Added the ability to send agent's own calling card to others.
- Added creating own calling card for the user to be able to share it with other residents.
- Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel.
- Calling cards for non-friends are not removed upon calling cards synchronization with friends list.
- Enabled "Share" menu item for calling cards in inventory.
2011-02-22 18:46:00 +02:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Vadim ProductEngine 05c14aa558 STORM-702 FIXED Made it possible to wear partial outfits
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2011-01-04 13:52:29 +02:00
Loren Shih 225ffbba20 Automated merge up from viewer-development 2010-10-27 15:08:21 -04:00
Vadim ProductEngine 802a985882 STORM-311 FIXED "Share" button in My Inventory SP was not updated on Current Outfit changes.
When you wear an inventory item, the code that disables/enables the button was called as soon
as the item got linked to COF, before it actually appeared on your avatar. However
to determine whether to enable the button, the code checked avatar appearence.

I fixed it to take the COF link into account, i.e. to treat items linked to COF as
worn (=not shareable), no matter has appearance been updated or not.
2010-10-20 19:24:32 +03:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Vadim Savchuk 7598015945 EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.

Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/

--HG--
branch : product-engine
2010-07-27 22:34:34 +03:00
Vadim Savchuk 749a48ad73 EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a selected item gets worn.
This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/.

Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn.
I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables.

So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/

--HG--
branch : product-engine
2010-07-28 21:23:14 +03:00
Tofu Linden 77c3a65db6 merge from viewer-release 2010-07-28 10:37:06 +01:00
Alexei Arabadji 431a6771cc Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
2010-07-27 18:00:37 +03:00
Vadim Savchuk 0a5eaf89bc EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a selected item gets worn.
This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/.

Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn.
I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables.

So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/

--HG--
branch : product-engine
2010-07-28 21:23:14 +03:00
Tofu Linden b459f95551 merge from viewer-release 2010-07-28 10:37:06 +01:00
Alexei Arabadji 872c7fd957 Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
2010-07-27 18:00:37 +03:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Sergei Litovchuk f790036002 EXT-8190 PARTIAL FIX Fixed loading indicator infinite spins upon pressing 'Save' for outfit with non-link items.
- Added inventory collector functor to select items by their actual type.
- Fixed outfit "dirtiness" calculation so only link items are checked.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/728/.

--HG--
branch : product-engine
2010-07-10 00:34:36 +03:00
Tofu Linden 297bab71ab CID-495
Checker: FORWARD_NULL
Function: show_item_original(const LLUUID &)
File: /indra/newview/llinventoryfunctions.cpp
2010-07-05 12:04:28 +01:00