Commit Graph

176 Commits (98d776ba767aa9d02f5059fd8436206135b49f9f)

Author SHA1 Message Date
Nicky 52fc943c6d Merge up to 26312 / 0010858de5a1 (V/dev tip). 2012-01-27 18:29:47 +01: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
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
ziree b8a7e35567 Added CreateInventoryCategory capability code, provided by Linden Lab. 2012-01-06 22:26:49 +01: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
Arrehn 4a67b9debb Disable Inventory debugging on release builds, by Nicky Dasmijn 2011-10-14 03:13:08 -04:00
Arrehn 8c4bfe78ed Inventory link processing improvements, by Nicky Dasmijn 2011-10-09 10:52:10 -04:00
Liny 2923d413ef EoL change, no code change 2011-09-01 18:08:44 -07:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Kitty Barnett 825d5bc58e Merged with RLVa-1.3.1c 2011-06-03 21:38:34 +02:00
Kitty Barnett c80812fb9f - internal : header dependency cleanup for rlvcommon.h and rlvhandler.h
--HG--
branch : RLVa
2011-05-22 11:34:34 +02:00
Tonya Souther 759419fe5a Make wearing a folder activate gestures in it. From Ansariel Hiller, fixes FIRE-822. 2011-04-26 17:28:58 -05:00
Tozh 299157658d fixed wearables storage array for ReplaceWornItemsOnly 2011-03-17 00:07:25 -04:00
Tozh 0f3d91e559 //-TT Inventory "Wear Items" with multiple attachment update 2011-03-11 08:24:47 -05:00
Liny 6ca185d47d Finished importing chatbar_as_cmdline from phoenix to firestorm.
License: BSD
2011-01-09 13:54:29 -08:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Kitty Barnett 37d5a0372f - added : folder links can be used in shared inventory
-> folder links are only followed if they're a descendent of the base folder
    -> linked folder can be located anywhere in inventory
    -> linked folder can't be in the base folder's descendent tree or be an outfit folder
    -> items inside of the linked folder will be folded in under the folder the link belongs to for @getinvworn
    -> only direct or folded descendents of the linked folder will be collected

--HG--
branch : RLVa
2010-09-30 10:38:59 +02:00
Kitty Barnett 436f3ba929 Merged with default tip (Revision b7f03886bbc7)
--HG--
branch : RLVa
2010-09-02 03:27:33 +02: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
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i
--HG--
branch : RLVa
2010-08-22 10:57:22 +02: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