Commit Graph

91 Commits (180daf3ab83ff9a83200c1952c0f09d20cfcb992)

Author SHA1 Message Date
Loren Shih 3e75137f26 EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
Loren Shih d4b888d478 EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory accordion
Put in a quick fix so that folders can't be made reparented to their own children.

--HG--
branch : avatar-pipeline
2009-12-08 17:31:02 -05:00
Loren Shih 202d86b155 EXT-2410 : Accepting an offered item should open the inventorySP
Added a new "Quiet" query for folder types, so I don't have to special case all the folders where we don't want UI notifications from inventory offers.
Fixed a bug where a sidepanel was considered active even if the sidetray was closed.

--HG--
branch : avatar-pipeline
2009-12-03 15:39:43 -05:00
Loren Shih 9841edf0f4 EXT-3060 : Turn links into broken links immediately when baseobj is purged
EXT-3067 : INFRASTRUCTURE : LLInventoryPanel::modelChanged cleanup

Added REBUILD mask to inventory observer.
Added new logic for rebuilding linked items when an item is purged.
Took out atrocious expensive refresh that was being triggered on most LLInventoryPanel::modelChanged.

--HG--
branch : avatar-pipeline
2009-12-02 18:31:01 -05:00
Loren Shih 8fdd2e0b28 EXT-3028 : "Find Original" does nothing if floater inventory isn't open
Changed logic for getActiveInventory so that it considers InventorySP.
Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage.
This currently contains a bug because the InventorySP always thinks it's open.

--HG--
branch : avatar-pipeline
2009-12-01 21:12:34 -05:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Loren Shih 56a861138b EXT-2675 : Folder that contains baseitems for COF doesn't load on first click
EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive

RightClickFetchInventoryObserver now works correctly to update menu
FetchInventoryDescendents now triggers notifyObservers properly
Fixed up gInventory.notifyObservers logic

--HG--
branch : avatar-pipeline
2009-11-19 21:57:14 -05:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Loren Shih 889456e892 Server compile fix.
Changed FT_CATEGORY -> FT_ROOT_INVENTORY
Removed AT_ROOT_CATEGORY

This parallels llasset cleanup work done on viewer-side for removing the unused AT_ROOT_CATEGORY type, and for making it more clear that a folder of type FT_CATEGORY (now FT_ROOT_INVENTORY) is your "My Inventory" folder.
2009-11-17 17:32:20 -05:00
Eric M. Tulla (BigPapi) cd9c5e5d70 merging avatar-pipeline branch into viewer-2-0 2009-11-13 20:34:55 -05:00
Loren Shih acdce23299 Header file cleanup
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
Loren Shih 3027c9fcce Header file #include cleanup for llinventorymodel and llinventorypanel.
Removed a bunch of unnecessary header inclues.

--HG--
branch : avatar-pipeline
2009-11-13 16:58:08 -05:00
Loren Shih f0cd44a6a2 EXT-2482 : Newly created folders have wrong default type
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused.  Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear.

This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type.

--HG--
branch : avatar-pipeline
2009-11-13 16:18:53 -05:00
Loren Shih 606256b9e6 Removed llinfos spam on prefetched items (changed to lldebugs).
--HG--
branch : avatar-pipeline
2009-11-13 11:08:28 -05:00
Loren Shih 999b9e28ce EXT-2349 : Diagnose warning spam: "[X] is in model and in view, but STRUCTURE flag not set"
EXT-2432 : Diagnose warning spam: "[X] does not exist in either view or model, but notification triggered"

Restructured llinventorypanel's handling of add/remove/structure so it's easier to understand
Removed false positive "notification triggered" warning since objects can now exist outside of various inventory panels' directories.

--HG--
branch : avatar-pipeline
2009-11-12 20:36:54 -05:00
Loren Shih 2ea1b06440 Backed out changeset: 153709ddee86
--HG--
branch : avatar-pipeline
2009-11-12 20:29:07 -05:00
Loren Shih 1bbcc4be83 EXT-24131 : Diagnose warning spam: "WARNING: LLObjectBridge::performAction: object not found - ignoring"
This warning is a false positive, also existed in 1.23.  Removing.

--HG--
branch : avatar-pipeline
2009-11-12 20:21:33 -05:00
Eric M. Tulla (BigPapi) 2903e5aa2b Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 14:48:37 -05:00
Loren Shih 6eb5f380e3 Extracted LLInventoryObserver classes from LLInventoryModel.h into their own subclass, LLInventoryObservers.h. This reduces dependencies and compile times, and makes these classes easier to locate.
I have not yet refactored classes to remove #include "llinventorymodel.h" and replace with #include "llinventoryobservers.h".  This will happen later.
2009-11-12 13:40:01 -05:00
Eric M. Tulla (BigPapi) 4272ecaabe Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:54:14 -05:00
Brad Payne (Vir Linden) de6ca4c5ea Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:20:57 -05:00
Eric M. Tulla (BigPapi) 7e74e18548 Fix for EXT-2244 - Auto fill the My Outfits folder from library/clothing if empty
-Reviewed by Seraph
2009-11-11 20:27:29 -05:00
Loren Shih bcdd3c25b6 Took out unnecessary llinfos msg from LLInventoryModel. 2009-11-11 20:21:45 -05:00
Brad Payne (Vir Linden) ec81a548c5 Link spam reduction - consolidating inventory cache loading messages. 2009-11-11 11:45:20 -05:00
Loren Shih 652c8f6b5e merge 2009-11-11 10:44:39 -05:00
angela 3cfd8a7ae8 adding warning msg when fetching for folders with NULL uuid 2009-11-11 14:34:00 +08:00
Loren Shih af9b99b457 EXT-2349 : Diagnose warning spam: [X] is in model and in view, but STRUCTURE flag not set
No longer allowing recursive calls to gInventory.notifyObservers.  Added debugging tools to catch when this happens.
This fixes the symptom, but we'll also need to remove whatever code is causing the recursive calls.
2009-11-10 18:30:36 -05:00
angela 6106c9a7da Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 10:48:17 +08:00
Brad Payne (Vir Linden) b6de723de0 merge 2009-11-09 19:06:51 -05:00
Brad Payne (Vir Linden) 1d4a6d1441 For EXT-2325: Should purge inventory cache moving from 1.23 to 2.0.
Added a version field at the beginning of inventory cache files.  If version field is not found or does not match expectected value, then the cache is discarded.  In 1.23, the version line triggers a warning but is otherwise ignored.

Reviewed by Seraph.
2009-11-09 17:01:08 -05:00
Loren Shih a54192db4b For EXT-2335 Diagnose warning spam: "LLInventoryPanel::buildNewViews called with invalid objectp->mType"
Trivial fix to just ignore reading in items that have unknown/none asset type.
2009-11-09 16:57:17 -05:00
angela 8ea12297e2 escape from infinitive loop of fetching inventory folder with NULL uuid 2009-11-09 13:34:32 +08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih bde7d67066 EXT-1866 : Inventory Side Panel
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
Steve Bennetts cadc8dc4a3 Fix for gInventory cleanup on shutdown, includes making LLNavigationBar a LLSingleton and explicitly destroying it with the rest of the UI. 2009-10-27 16:31:07 -07:00
Steve Bennetts c0abbb6a64 Fixed a crash on exit in gInventory destructor. 2009-10-26 23:41:18 -07:00
Steve Bennetts 127b428863 merge 2009-10-23 12:15:22 -07:00
Loren Shih 584962d5c7 svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Bradley Payne 7eca974a11 Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
Bradley Payne 73d152093d For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10 18:42:19 +00:00
Steven Bennetts 5612f13dc8 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3
* Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801
* New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-09-02 02:59:07 +00:00
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
2009-08-27 16:25:02 -04:00
Loren Shih ac1b723fd7 svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
Loren Shih ed351ca913 For DEV-37955 : Broken links possible if linked item is cached but baseobj not cached
Major fix to guarantee no broken links.  If a link comes through from the cache but its baseobj doesn't also exist in the cache, then don't add the link to memory yet, and uncache the folder.

Reviewed by: Nyx, Vir.
2009-08-13 16:05:07 +00:00
brad kittenbrink 39c2a584f4 Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api. 2009-08-13 01:28:38 -04:00
Loren Shih 7bbc5cdea6 svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification

This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00