Commit Graph

201 Commits (8243d30f02abd56dc2abdc1925f16ccf81fbbb49)

Author SHA1 Message Date
Tank_Master cc44316aed Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
Nicky ceea332a9c Change old style comments <ND> to <FS:ND> to avoid any future confusion/ 2012-12-16 05:19:32 +01:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Brad Payne (Vir Linden) 6ee0456220 merge 2012-06-04 15:28:08 -04: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
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Nicky d8d52ba63f Change line endings from windows to unix. 2012-06-10 20:28:03 +02:00
Ansariel cf75e61ddc Put AO and LSL Bridge folder protection back in place that got lost during merge to LL V3.3.2 2012-06-10 14:18:35 +02:00
Tank_Master 279e08bc21 Merge FS LGPL 2012-05-31 01:00:34 -07:00
Tank_Master 1c55d5cbb6 Merge LL 3.3.2 release 2012-05-28 17:02:11 -07:00
Whirly f5c2cd74e2 Fixed typo in llinventoryymodel.cpp (FIRE-6444) 2012-05-30 20:00:47 +01: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
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