Commit Graph

161 Commits (180daf3ab83ff9a83200c1952c0f09d20cfcb992)

Author SHA1 Message Date
Brad Payne (Vir Linden) b8ac919d6f merge
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
Brad Payne (Vir Linden) ae8c1d1ea8 For EXT-3264: Missing separators in inventory context menus - restore
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
Loren Shih 99590047eb automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
Eric M. Tulla (BigPapi) 1f3a554709 Minor gcc compile fix
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
Eric M. Tulla (BigPapi) f042f35381 Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
Brad Payne (Vir Linden) 264446a5ce For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 19:35:58 -05:00
Brad Payne (Vir Linden) b131314dba Fix for r. click Edit on a link to wearable
--HG--
branch : avatar-pipeline
2009-12-10 18:39:44 -05:00
Brad Payne (Vir Linden) e7ef47e825 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 18:19:23 -05:00
Eric M. Tulla (BigPapi) 9db47b1d4b Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms 2009-12-10 16:07:54 -05:00
Brad Payne (Vir Linden) 6af53dd7e2 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 15:31:08 -05:00
Loren Shih ca56ac2179 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
--HG--
branch : avatar-pipeline
2009-12-10 15:11:02 -05:00
Brad Payne (Vir Linden) 50a865e212 merge
--HG--
branch : avatar-pipeline
2009-12-09 19:15:30 -05:00
Brad Payne (Vir Linden) 522463108b For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-09 19:12:05 -05:00
Nyx (Neal Orman) 019fc57855 fix for linux build breakage, a LLPointer was being implicitly cast wrong
approved by Seraph

--HG--
branch : avatar-pipeline
2009-12-09 11:34:44 -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
Brad Payne (Vir Linden) 209a660f08 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-07 17:56:34 -05:00
Brad Payne (Vir Linden) 16efeb8581 merge
--HG--
branch : avatar-pipeline
2009-12-04 19:01:31 -05:00
Brad Payne (Vir Linden) f017058345 For EXT-2845, EXT-2846: standardizing gesture context options to work like wearables and attachments
--HG--
branch : avatar-pipeline
2009-12-04 18:58:57 -05:00
Loren Shih 71cd24b479 EXT-3124 : Add lookup for finding all linked items to an item
Added ability to filter by UUID.  Work in progress.

--HG--
branch : avatar-pipeline
2009-12-03 21:32:03 -05:00
Eric M. Tulla (BigPapi) b05ebd8977 merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
Loren Shih c09b2bd9c9 EXT-3057 : Refine the context options that exist for broken links
EXT-2950 : Trying to waer a link or to "Find Original" of a link silently fails when original is deleted

Missing links are now handled correctly in the right-click context menu.

--HG--
branch : avatar-pipeline
2009-12-02 14:16:07 -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
Loren Shih 4916305ce1 EXT-3029 : Missing icons for broken item link / broken folder link
EXT-3024 : Broken links don't show up in inventory

Mocked up some link icons for broken links.  These need to be polished up.
Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory.

--HG--
branch : avatar-pipeline
2009-12-01 18:57:15 -05:00
Loren Shih 27351b8bf5 automated merge for viewer-2.0 -> avp.
--HG--
branch : avatar-pipeline
2009-12-01 12:52:21 -05:00
Brad Payne (Vir Linden) e8ec98c307 line ending fixes
--HG--
branch : avatar-pipeline
2009-12-01 12:06:31 -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 59eb8a43a4 Switched line endings to Unix. 2009-11-25 12:17:38 -08:00
Loren Shih 57bc7dc44f automated merge from viewer-2-0 pull -u 2009-11-25 12:01:05 -05:00
Brad Payne (Vir Linden) d159daa8d7 For EXT-2584: Select and rename new folder when creating new outfit
--HG--
branch : avatar-pipeline
2009-11-25 11:31:03 -05:00
Eric M. Tulla (BigPapi) c5ef834606 Fix for EXT-2667 - making sure inv_item isn't null 2009-11-25 11:21:08 -05: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
Brad Payne (Vir Linden) c812c616ea merge
--HG--
branch : avatar-pipeline
2009-11-24 14:39:39 -05:00
Brad Payne (Vir Linden) fc6cfc27be Fix for EXT-2571 to accommodate accordion panels
--HG--
branch : avatar-pipeline
2009-11-24 14:37:48 -05:00
Brad Payne (Vir Linden) e1cd91de4e For EXT-2571: Right click context menu for Outfits
--HG--
branch : avatar-pipeline
2009-11-24 12:49:36 -05:00
Loren Shih e11d1c1d2b EXT-2705 : Remove (dont' just grey out) right-click context menu options for Links that aren't necessary
--HG--
branch : avatar-pipeline
2009-11-23 18:10:37 -05:00
Loren Shih 7e181025c0 EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive
Context menu now fills in after folder contents are fetched.

--HG--
branch : avatar-pipeline
2009-11-20 15:38:50 -05: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 ad86caf479 EXT-2668 : Screwy logic for figuring out if a folder is removable
EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit
EXT-2662 : Can't delete a worn item link

Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children.
Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion.

--HG--
branch : avatar-pipeline
2009-11-19 17:56:30 -05:00
Loren Shih afbc78d039 Merging viewer-2-0 changes into avatar-pipeline branch
--HG--
branch : avatar-pipeline
2009-11-19 13:36:27 -05:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Loren Shih 4a38c90adb EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -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
Brad Payne (Vir Linden) 815f336a15 For EXT-2574, EXT-2577: remove from outfit now enforces mandatory body parts, teen underthings
--HG--
branch : avatar-pipeline
2009-11-18 11:23:59 -05:00
Loren Shih 0f94b7ac3d merge 2009-11-17 20:17:21 -05:00
Loren Shih a34c89df87 EXT-1916 : Landmarks are not sorted in the Favorites Bar accordion
Sorting was fixed when LLFolderViewFolder was added back into the inventory panels.  This checkin additionally allows sorting in the landmarks inventory panel.
2009-11-17 20:13:31 -05:00
Loren Shih ceee6c3e5e Header file cleanup.
Removed unnecessary headers from llinventorybridge.cpp.
2009-11-17 19:40:43 -05:00
Eric M. Tulla (BigPapi) 3217887356 Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
Brad Payne (Vir Linden) 6474dbd469 For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - handle untyped folder dragged to outfit
--HG--
branch : avatar-pipeline
2009-11-17 16:07:29 -05:00
Brad Payne (Vir Linden) 70b605e419 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG--
branch : avatar-pipeline
2009-11-17 10:34:14 -05:00