Commit Graph

129 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
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
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
Loren Shih 2a60fdb197 EXT-5296 : Inventory folders revert to defort "sort" with each login
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code.  Makes this sorting code a lot easier to debug.
2010-03-04 15:29:49 -05:00
Tofu Linden a0c57cbb82 CID-207 assert. 2010-02-13 14:05:09 +00:00
Tofu Linden 74ffa0fa48 CID-207
Checker: REVERSE_INULL
Function: LLInventoryModel::addItem(LLViewerInventoryItem *)
File: /indra/newview/llinventorymodel.cpp
2010-02-13 14:04:26 +00:00
Tofu Linden fc70ca5403 PE merge. 2010-02-03 15:52:44 +00:00
Mike Antipov 2a77ef80ce Backed out changeset 5add97e5b6cf
Related to major bug EXT-3985 [BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x
Removed auto-cleanup patch to repair Lanmarks in Favorite bar (remove LM Sort prefixes)

--HG--
branch : product-engine
2010-02-03 14:18:06 +02:00
Loren Shih 85cc9f121d EXT-4874 : Client freezes on right click - take item
Fixed infinite loop due to parent_id not being incremented properly in loop.
2010-02-02 20:25:48 -05:00
Vadim Savchuk db4e46e93d Mere from default branch
--HG--
branch : product-engine
2010-01-29 16:46:06 +02:00
Mike Antipov a08f098847 Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
-- implemented patch to remove LM prefixes from landmarks' names
*NOTE: It will be unnecessary after the first successful session in viewer 2.0.
Can be removed before public release.

Implementation details:
At the first run with this patch it patches all cached landmarks: removes LM sort prefixes and
updates them on the viewer and server sides.
Also it calls fetching agent's inventory to process not yet loaded landmarks too.
If fetching is successfully done it will store special per-agent empty file-marker
in the user temporary folder (where cached inventory is loaded) while caching agent's inventory.
After that in will not affect the viewer until cached marker is removed.

--HG--
branch : product-engine
2010-01-29 10:11:53 +02:00
Rick Pasetto dc47f52e9f merge 2010-01-21 18:40:37 -08:00
Leyla Farazha 9ab7d647c1 EXT-3416 Can't name a new gesture on creation (and renaming is HARD)
reviewed by Callum
2010-01-21 15:09:38 -08:00
Tofu Linden 62ab590b16 trivial comment fix. 2010-01-18 15:41:12 -08:00
Mike Antipov 6e67ac5e02 Fixed low bug EXT-4311 (Order of items in 'Favorites Bar' folder remains non-changed if change its order in the 'Favorites Bar')
-- reason: there was two places where identical resorting of Favorite landmarks functionality was implemented: InventoryBridge & Favorite bar.
    It was not impelnmented properly in favorites bar: LLInventoryObserver::SORT flag was not set after d-n-d.
-- fix: moved identical functionality to update & save order of Favorite landmarks from these places to Inventory Panel

--HG--
branch : product-engine
2010-01-15 18:02:42 +02:00
Mike Antipov 06838dfd57 Work on normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- refactoring: move functionality to rearange Favorite landmarks from Inventory Folder bridge to Inventory model
-- improved logic to place dragged landmark before target one.

--HG--
branch : product-engine
2010-01-15 19:56:37 +02:00
Loren Shih f16d357b3b EXT-4271 : Remove "LLInventoryModel::accountForUpdate accounted..." spam
Took out llinfos spam.
2010-01-14 20:26:36 -05:00
Loren Shih b134bf554d EXT-4319 : Category descendent count fails to increment if descendent received while cat still fetching
EXT-4320 : Mismatch in folder descendents count is causing fetch descendents to never complete
EXT-2244 : My Outfits bars should be populated from Library on first 2.0 login

Implemented a workaround for an issue where descendent count was becoming unsynchronized.  EXT-4320 is the workaround, this solves for EXT-2244, and EXT-4319 is the actual bug (whose fix is still pending).
2010-01-14 13:54:15 -05:00
Yuri Chebotarev dd20b16ed0 no ticket. HACK !!!.
HACK code to fix inventory root folder for some broken accounts
code executed only once and takes O(N) where N - number of inventory items.

--HG--
branch : product-engine
2009-12-23 18:13:57 +02:00
Brad Payne (Vir Linden) 97031cb90d merge 2009-12-21 17:28:06 -05:00
Brad Payne (Vir Linden) ced5b819d7 For EXT-3567: Folders should show as 'Loading...' when contents being fetched 2009-12-21 17:21:48 -05:00
Loren Shih c26034531a EXT-3582 : My Outfits populates from library if I delete my last outfit
Autopopulation logic is now smarter and only triggers if this is the first time you're logging into viewer2.0.
2009-12-21 16:49:14 -05:00
Loren Shih 37b04c1507 EXT-3582 : My Outfits populates from library if I delete my last outfit
Tracking a "Is this my first time in viewer2.0?" flag and only populating My Outfits folder if it's true.
2009-12-21 14:54:55 -05:00
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
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 5ed6e0720a warn-on-failure:unix-eol
automated merge from trunk
2010-02-25 16:50:21 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden 0bf246ed66 Automated merge 2010-02-25 00:17:42 -08: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