Commit Graph

119 Commits (bdce32a02b34e42ab2f145af5f8beb54f4e2b534)

Author SHA1 Message Date
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
andreylproductengine 4fdf1c34b4 MAINT-3812 FIXED "Remove from outfit" is unavailable for folders containing only gestures 2014-03-13 01:44:41 +02:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Brad Payne (Vir Linden) b1769b6a60 SH-4234 FIX - the only persistent failure seen was caused by a broken link in the outfit. Modified updateIsDirty() to ignore broken links. 2013-06-06 13:55:27 -04:00
Brad Payne (Vir Linden) 6c56c77ec5 SH-4027 WIP - initial implementation of item update via AIS. 2013-05-24 08:53:21 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Gilbert Gonzales 0911dafd81 CHUI-687: post code review changes. Now upon deletion of an item, DND mode must be enabled in order to remove a notification from the DND history. 2013-01-23 11:39:33 -08:00
Gilbert Gonzales d0204ab367 CHUI-687: Problem: User sees inventory offer notifications for deleted items when logging in from do not disturb mode. Resolution: If an item that is deletes has a DND notification saved, then remove that notification so that it doesn't appear onec the user exists DND mode. 2013-01-23 09:51:17 -08:00
Merov Linden 569701cfc8 CHUI-574, CHUI-575 : Fixed inventory regressions : select the first filtered item when searching the inventory, simply made the folder selection secondary to item selection. 2012-12-13 17:15:18 -08:00
Merov Linden 834ded33ae CHUI-470 : Fixed : Enable contextual menu in torn off conversations 2012-11-19 18:41:52 -08:00
Todd Stinson 268d5bd4bd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-08-09 17:04:00 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Richard Linden 7d0150f12d CHUI-101 WIP Make LLFolderView general purpose
started to remove newview dependencies from llfolder*
2012-07-02 19:37:28 -07:00
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
Richard Linden cb865a7e13 CHUI-101 WIP Make LLFolderView general purpose
moved filtering logic to viewmodel
2012-06-27 18:56:10 -07:00
Richard Linden 379eec8841 CHUI-101 WIP Make LLFolderView general purpose
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -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