Commit Graph

172 Commits (cbff0e7ab8afeebb6ddab854d35ea12ef9a9930a)

Author SHA1 Message Date
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Oz Linden 7637acf76e merge changes for DRTVWR-149 2012-05-22 06:03:42 -04: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 f79b775fcc merge changes for drtvwr-136 2012-04-13 20:55:47 -04:00
Nat Goodspeed b7e0e44e32 CHOP-854: Use new LLInventoryModel::removeObject() to discard offer.
Introduce new LLInventoryModel::removeCategory() method comparable to
removeItem(), but for folder objects (using changeCategoryParent() rather than
changeItemParent()). Introduce removeObject() method that calls one of the
above, depending on runtime object type.
2012-03-27 22:39:31 -04:00
Nat Goodspeed b8561da34d CHOP-854: Make LLInventoryModel::removeItem() call changeItemParent().
The body of removeItem() was already nearly identical to the body of
changeItemParent(); this eliminates the redundancy.
Improve logging for changeItemParent().
2012-03-27 19:06:33 -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
Brad Payne (Vir Linden) b0b1634bd2 fixed typo 2012-03-22 18:33:02 -04:00
Nyx (Neal Orman) e1a10fd81c SH-3040 FIX Inventory caching issues
A complete fix for a single cause of caching issues, does not solve all caching issues.
Fixes the issue of inventory links that were incorrectly being marked as broken.
Broken links get a second chance to see if their base objects exist in inventory now.
2012-03-20 17:31:14 -04:00
Merov Linden 8270054805 EXP-1915 : Rewrote the fetching mechanism for folders making it truly recursive. 2012-03-13 21:08:10 -07:00
Merov Linden 7b866448db EXP-1922 : Skip the clipboard elements when purging the trash when in cut mode 2012-03-12 13:59:25 -07:00
Paul ProductEngine b57a6186a2 MAINT-841 FIXED ([PUBLIC]Folder "Lost and found" isn't cleaned)
- This happens if something was added to the category before it was initialized,
so accountForUpdate didn't update descendent count and thus the category thinks
it has fewer descendents than it actually has.
2012-04-12 18:46:27 +03:00
Leslie Linden 1422be8312 Merge from viewer-development 2012-01-09 09:56:52 -08:00
Aura Linden bd3a652eab Add capability-based create folder routine for more reliable inventory, with fix for copy and wear 2012-01-06 07:46:53 -05:00
Leslie Linden 2e564abcd6 EXP-1730 FIX
EXP-1731 FIX
EXP-1735 FIX
EXP-1736 FIX
EXP-1737 FIX
EXP-1738 FIX
EXP-1739 FIX

* Users can no longer drag and drop items to the outbox from in world, notecards or the library.
* Drag and drop now blocks the creation of hierarchies that are too deep, too many folders or contain too many items.
* Settings now exist to specify drag and drop limitations to the outbox, named:
       InventoryOutboxMaxFolderDepth (4)
       InventoryOutboxMaxFolderCount (20)
       InventoryOutboxMaxItemCount (200)
2011-12-15 14:26:42 -08:00
Leslie Linden 130d017085 * Updated inventory code to handle creation of the "Received Items" panel when
the sim notifies the viewer that the folder is created.  Unfortunately, the
  sim is not yet doing this so a relog is required to properly get this working.
2011-10-31 12:01:10 -07:00
Merov Linden 5676e4a62e EXP-1439 : Modify DaD on the Favorite toolbar so that reordering visible landmarks don't send any back to the end of the list 2011-10-21 18:36:06 -07:00
Aaron Stone 5e989213ad CHOP-761 Items now disappear when the sim says so. 2011-07-27 16:24:08 -07:00
Aura Linden 6d789f59f8 Added handling for RemoveInventoryObjects message. Fixed handling of RemoveInventoryFolder 2011-07-21 17:07:05 -07:00
Leyla Farazha 9847f5674c MKT-3227 DD clothing and bodyparts forced to worn arriving in inbox 2011-06-30 14:59:12 -07:00
Brad Payne (Vir Linden) 0e99a8b2c5 SH-1492 WIP 2011-05-20 15:52:33 -04:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Seth ProductEngine 67f33bff1b STORM-1042 FIXED Fixed the inventory observers of newly added items.
The problem was caused by an outdated message name stored in LLInventoryObserver::mMessageName and not updated properly in LLInventoryModel::notifyObservers().
The message name used in LLInventoryAddedObserver::changed() was the name of the message most recently passed by LLInventoryModel::notifyObservers(), instead of the name of the latest actually received message. Using the most recent message name in this case fixed the problem.
2011-04-12 03:00:05 +03:00
Leyla Farazha a2c659378b SH-1203 Remove "meshes" folder from inventory 2011-03-23 11:35:07 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Vadim Savchuk 75a66a146b EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo.
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/

--HG--
branch : product-engine
2010-08-26 18:59:08 +03:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks e68f9e566b merge 2010-08-31 16:37:40 -05:00
Brad Payne (Vir Linden) ca1224fd79 EXT-8360 FIX - item name changes get propagated to the various appearance panel widgets 2010-07-20 10:44:27 -04:00
Mike Antipov 14724102f3 EXT-8319 FIXED Added method to localize inventory categories having predefined names, updated predefined keys for "Male - Get lost" and "Female - Get lost".
There were two issues:
 * "Male - Get lost" and "Female - Get lost" gestures have by 2 spaces before "-" in their names.
 * Folders were not processed to be localize. This was not implemented correctly in EXT-7051.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/753/

--HG--
branch : product-engine
2010-07-14 16:25:17 +03:00
Loren Shih a5522ff5bd EXT-3568 FIXED Outfit Folders sometimes show up as empty until right-clicked
Changed logic to not set descendent count to 0 for problematic folders.
2010-07-07 10:12:37 -04:00
Loren Shih 4ae0a0703b EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15 17:58:08 -04:00
Loren Shih 0be5ce0a59 EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode.  Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
Mike Antipov fe5d72a7c3 EXT-7503 WIP Improved LLInventoryModel::updateItem to avoid an extra calls of notifyObservers while updating calling card item.
- added check on whether avatar name exists in Name Cache before using its getter with callback (which raises notifyObservers).

Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/526/

--HG--
branch : product-engine
2010-06-08 15:13:43 +03:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
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-03 20:06:25 -04:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Loren Shih 35fb83e1e3 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Removed llinfos that was causing excessive spam.
2010-05-25 16:05:17 -04:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
Loren Shih 358d23a3a0 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24 16:39:34 -04:00
Loren Shih ee53b612fb EXT-7324 : INFRASTRUCTURE: Inventorymodel code cleanup
Superficial header file cleanup
Lots of moving functions around and recategorizing in LLInventoryModel.h
Removed some obsolete functions, changed scoping of others
Moved some static functions from LLInventoryModel into llinventoryfunctions.h
2010-05-12 16:46:28 -04:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Loren Shih 909091cc0c EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -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