Commit Graph

129 Commits (f2da2c00a8c290cfb98adf5f53745a0108865ce9)

Author SHA1 Message Date
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
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
Brad Payne (Vir Linden) 9c823a1d40 Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable
--HG--
branch : avatar-pipeline
2009-11-17 10:33:47 -05:00
angela bce2cab144 EXT-2317 I18N: use the localized names for [ATTACHMENT_POINT] in strings.xml WornOnAttachmentPoint 2009-11-16 21:27:08 +08:00
Loren Shih 42319d1ab8 Header file cleanup
Moved LLInventoryPanelObserver to be private to LLInventoryPanel

--HG--
branch : avatar-pipeline
2009-11-13 18:22:00 -05:00
Brad Payne (Vir Linden) cc72b78b5f Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 16:49:36 -05:00
Brad Payne (Vir Linden) 2c05c3dab3 For DEV-41820: Allow dragging links to Looks and Current Look: copy the link, wear if Current Look
--HG--
branch : avatar-pipeline
2009-11-13 16:48:53 -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
Brad Payne (Vir Linden) 581fccecc8 For DEV-41818 - text change 'Goto Link' -> 'Find Original'
--HG--
branch : avatar-pipeline
2009-11-13 15:47:49 -05:00
Brad Payne (Vir Linden) 4b05dc4890 LLAppearanceManager cleanup - 2 methods renamed
--HG--
branch : avatar-pipeline
2009-11-13 15:20:54 -05:00
Loren Shih 3b730cef75 merge
--HG--
branch : avatar-pipeline
2009-11-13 11:10:29 -05:00
Brad Payne (Vir Linden) f36c43abde branch merge
--HG--
branch : avatar-pipeline
2009-11-13 09:35:37 -05:00
Loren Shih 2886d0ec92 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:29:48 -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
Nyx (Neal Orman) 31ceac8289 EXT-1796 right click menu has "take off items" for gestures
renamed "take off items" to "remove from outfit"

Code reviewed by Seraph
2009-11-12 19:16:01 -05:00
Brad Payne (Vir Linden) 0b104e2a41 LLAppearanceManager cleanup - turning into proper singleton
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00
angela 6106c9a7da Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 10:48:17 +08:00
Loren Shih c9937716aa EXT-1866 : Inventory Side Panel
Various trivial UI behavioral changes for disabling/enabling old/new floaters when bringing up properties of objects/items.
This is to make the UI behavior compliant with the Inventory Panel MVP.

Also added missing sidepanel_task_info.xml (although this is not actually enabled for viewer2.0).
2009-11-09 12:26:27 -05:00
angela 8ea12297e2 escape from infinitive loop of fetching inventory folder with NULL uuid 2009-11-09 13:34:32 +08:00
Steve Bennetts 8631443847 merge changes from product-engine 2009-11-06 18:13:38 -08:00
Loren Shih 9c048d12fd merge
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
Loren Shih 2aa981ac23 EXT-2278 : "Save Texture As" for bottom panel
EXT-2310 : "Save Texture As" for inventory right-click menu

"Save Texture As" now works properly and brings up the texture preview while saving.
Also added "Save Texture As" to the right-click inventory context menu.

--HG--
branch : avatar-pipeline
2009-11-06 17:35:05 -05:00
Alexei Arabadji 8a4e36a9bd fixed EXT-2295 "'Group Chat' btn makes chicklet appear only"
--HG--
branch : product-engine
2009-11-06 19:31:27 +02:00
Loren Shih 7615ec497e EXT-2216 : Task properties sidepanel
EXT-2224 : Edit item then delete item -- edit panel still active
EXT-2228 : Buy/Pay/Open buttons for Task sidepanel

--HG--
branch : avatar-pipeline
2009-11-04 20:30:11 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih 5884c2fa4c EXT-2131 : object properties sidepanel
EXT-2128 : remove multi-properties ability, disable from inventory menu

Also includes llsidepanelinventory cleanup.

--HG--
branch : avatar-pipeline
2009-11-03 13:58:08 -05:00
Loren Shih 310a7b60f7 Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05: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
Erica 7e4394dbcd Added dummy icons for Tattoo and Alpha textures, pushed Lis' preferences changes for EXT-1927 2009-10-29 11:58:45 -07:00
Steve Bennetts 4ddaa866dd merge 2009-10-23 12:18:46 -07:00
Steve Bennetts 127b428863 merge 2009-10-23 12:15:22 -07:00
Loren Shih a5453d45fe For EXT-1863 : "Wear" and "Take Off" for items should be properly greyed out depending on item worn state 2009-10-23 17:41:32 +00:00