Commit Graph

314 Commits (efca9657a22ebbcacee705c00cac4e803f2ffa98)

Author SHA1 Message Date
Loren Shih 2961992a7e EXT-8448 FIXED [crashhunters] Crash in LLFolderBridge::folderOptionsMenu(), and Trash folder options incorrect
Minor fix to previous checkin for this crash.  This fixes the UI issue where you're seeing the context options for the previous folder you clicked when you click on trash/library.
2010-07-20 12:50:13 -04:00
Richard Linden 39ae8785b4 EXT-8448 FIX [crashhunters] Crash in LLFolderBridge::folderOptionsMenu()
reviewed by Callum
2010-07-19 15:15:04 -07:00
Vadim Savchuk faf262e2a9 EXT-8373 FIXED Fixed translation of attachment points in "Attach..." / "Attach To..." menus (AE and inventory).
There is an on_enable callback set for the menu items. It tries adding a suffix like "(obj_name)" if there is already an attachment on the attachment point.
No matter whether the suffix has been actually added, the callback resets the menu item label to its parameter (cbparams["label"]).

The problem was that we passed the original English attachment point name to the callback, that set it as the menu item name, thus screwing up translation.
The fix is to pass translated attachment point name to the on_enable callback.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/768/

--HG--
branch : product-engine
2010-07-15 18:22:34 +03:00
Loren Shih d8f795aa9c automated merge 2010-07-09 10:19:15 -04:00
Loren Shih 074157c1fe EXT-8292 FIXED Folder wear options disabled in expanded menu on first right-click
EXT-8261 FIXED 'Share' item is disabled in 'My Inventory' folder's context menu

Items can now be appended to menus (versus menus being the most restrictive out of all the item choices).
2010-07-08 17:46:36 -04:00
Loren Shih b67009415d EXT-8269 FIXED "Copy and Wear" from in-world object doesn't wear bodyparts
EXT-8139 FIXED "Copy and wear" when unboxing an outfit defaults to "add" instead of "replace items"

Copy&Wear now takes off all inventory item before wearing new outfit.
2010-07-08 15:02:45 -04:00
Mike Antipov 479731f6a0 EXT-8243 FIXED Replaced method to create link in COF with top-level LLAppearanceMgr::wearItemOnAvatar() method while DnD a wearable to COF.
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/714/

--HG--
branch : product-engine
2010-07-08 19:12:45 +03:00
Loren Shih 5ea8653b3d EXT-8252 FIXED Folders can be dragged into Outfits
Fixed logic to disallow folders from being dragged into outfits.
Also added a bunch of low-risk superficial cleanup such as comments, better local variable declaration, etc.
2010-07-06 17:08:05 -04:00
Loren Shih 419bfb16fd automated merge 2010-07-06 15:49:32 -04:00
Loren Shih ced040f8ae EXT-8244 FIXED Not wearable links could be added to COF by drag-n-drop in the Inventory
Fixed the dnd behavior so that you can only drag appropriate items into the COF or Outfits folder.
Did a bit of superficial code cleanup in terms of adding comments and relocating blocks of code.  The actual coding fix was pretty small despite the diff; most of the diff is superficial cleanup.
2010-07-06 15:47:17 -04:00
Nyx (Neal Orman) e78f96b2fb EXT-8213 FIX users cannot replace their shape if it does not load
Removed checking for wearables loaded on replacing or adding individual items.
After reviewing the code in depth, we believe this is safe to do,
particularly since we allow the user to replace their outfit from the same state.

Filed a followup issue for later investigation EXT-8231

Code reviewed by Vir and Seraph
2010-07-02 15:55:49 -04:00
Loren Shih cd4c44fe7a EXT-8198 Incorrect right-click options for library folders
Only adding "--no options--" when right-click context menu is empty.  Normal priority bug but rather annoying visually.
2010-07-02 14:56:12 -04:00
Loren Shih 05bc1be479 EXT-8197 FIXED Can't select mixed group of wearables and objects for "Wear" 2010-07-01 17:44:52 -04:00
Loren Shih 3ce3df5643 EXT-8033 FIXED Selecting multiple inventory items can give incorrect right-click context menus
EXT-8093 FIXED No "open" or "properties" items for gestures

Re-added open/properties to gestures
Fixed right-click inventory selection so that it does something logical & consistent for multiple items.  Had to add a "getLastVisible" to LLView to support this.
2010-06-28 12:25:33 -04:00
Loren Shih 1a2a25cb85 EXT-7747 FIXED Turn on multiattachments for 2.1 as debug setting
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-24 17:38:12 -04:00
Sergei Litovchuk 887b2858d4 EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list similar to My Outfits view.
- Added common interface for My Outfits and Wearing tabs.
- Changed LLPanelOutfitsInventory to use common interface for My Outfits and Wearing tabs.
- Removed dependency on outfits side panel from inventory bridge context menus.
- Removed unused LLShowCreatedOutfit class from llagentwearables.cpp.
- Restored opening newly created outfit in My Outfits tab.
- Fixed worn items indication for Wearing tab items.

Revieved by Neal Orman at https://codereview.productengine.com/secondlife/r/604/.

--HG--
branch : product-engine
2010-06-11 20:02:42 +03:00
Vadim Savchuk a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Monroe Linden b022a9f158 Fix for EXT-6277 ("Edit" right-click inventory item does nothing if item is not worn).
Reviewed by Leyla.
2010-06-17 15:59:42 -07:00
Vadim Savchuk 9f99644360 EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items to be enabled when appropriate and work properly.
Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options:
- The menu items of the outfit context menu and the My Outfits gear menu are now disabled
  when inappropriate instead of being hidden.
- The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit.
  (was: depending on whether you're wearing the outfit)
- Changed the way the options work: they now only operate on clothes and attachments.
  "Add to COF" now only adds those body parts that are missing in COF;
  "Remove from COF" doesn't touch body parts at all.

  Without this change both "Add" and "Remove" options would be available simultaneously, because
  any valid outfit contains body parts. I think that would be confusing.
  And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/

--HG--
branch : product-engine
2010-06-17 19:03:57 +03:00
gabriel lee 42a4ab9ae1 EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
2010-06-16 18:03:03 +01:00
Loren Shih f12aa928c5 EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
Loren Shih a37f7ec200 automated merge 2010-06-10 11:41:59 -04:00
Loren Shih 388318c532 EXT-7430 : Create art overlay for inventory icons that are links
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-10 11:41:28 -04:00
Loren Shih e414a91d7f EXT-7430 : Create art overlay for inventory icons that are links
Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
2010-06-09 17:09:42 -04:00
Vadim Savchuk 48ccb5755e EXT-6726 ADDITIONAL FIX Minor code cleanup.
Removed duplicated code from LLFolderBridge::isItemRenameable().

Requested by Richard at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-09 18:19:23 +03:00
Nyx (Neal Orman) c26eeb6f7a Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 11:10:15 -04:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Paul Guslisty 5dc2fcf8e2 EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panels
- Added checking in LLItemBridge::getLabelStyle() if item is worn
- Also deleted unnecessary method LLObjectBridge::getLabelStyle() as it duplicate LLItemBridge::getLabelStyle()

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/501/

--HG--
branch : product-engine
2010-06-03 20:46:56 +03:00
Vadim Savchuk 671625695f EXT-6726 WIP Added more menus to the Appearance SP.
Done:
- Implemented creating new wearables via My Outfits gear menu.
- Implemented renaming/removing/editing an outfit via My Outfits context menu.
- Implemented "Attach to..." / "Attach to HUD..." context submenus.

- Now disabling (instead of hiding) irrelevant wearable context menu items.
- Added "Take Off / Detach" context menu item that's shown for clothes and attachments.
  Useful if you selected a bunch of items and want to take them all off.

- Fixed taking off an outfit
  (not all wearables were taken off because of a wrong inventory collector).
- Fixed crash when editing a skirt
  (reference to a missing string).

- In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables
  and introduced MASK_UNKNOWN per Nyx's request.

Known issues:
- "Attach to..." context menus may be displayed partially off-screen
  (there is the same bug in the inventory panel).
- The way we invoke wearable editing panel after the wearable gets created
  is currently a hack.

TODO:
- Wear / take off / rename / delete an outfit via My Outfits gear menu
  (currently not implemented because of missing selection support in My Outfits).
- Add "Create new..." to body part / clothing context menu in Edit Outfit.
- Add "Create new..." submenus to the Edit Outfit gear menu.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-02 20:46:16 +03:00
Igor Borovkov ec6be24ed5 EXT-2704 FIXED added custom inventory folder icons
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/

--HG--
branch : product-engine
2010-06-02 13:59:07 +03:00
Nyx (Neal Orman) cd46893057 EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor

Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up

All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2

(sorry dessie! :) )
2010-05-27 14:40:49 -04:00
Nyx (Neal Orman) ec7dbc7040 EXT-7213 WIP kill old appearance editor and traces of code
Removed last remaining references to gFloaterCustomize.
Next step: kill the files themselves.
Will be reviewed when complete, before pushing
2010-05-26 18:22:04 -04:00
Nyx (Neal Orman) 1084bfef00 EXT-7213 WIP kill old appearance editor and all traces of code
part 2 - correcting a few points that would have broken the build.
Final version will be reviewed before pushing.
2010-05-26 13:27:19 -04:00
Nyx (Neal Orman) c7b6ab8208 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-26 12:04:26 -04:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Nyx (Neal Orman) b524aacb59 EXT-7213 WIP kill old appearance editor and all traces of code
First pass - eliminated all references to gFloaterCustomize except
those that call saveIfDirty. Haven't compiled, haven't reviewed.
Will clean up in further patches and get reviewed before pushing.
2010-05-25 20:17:23 -04:00
Tofu Linden a781dd767c VWR-13743 FIXED Change Request: Change double click action for inventory wearables
DEV-33391 FIXED Change Request: Change double click action for inventory wearables

Pulled this from the AvP backlog and implemented it, as it's a pain point from Ben's usability findings.  And people loooove this in 3rd party viewers.
(transplanted from cd0857d027305aec3dbdfe1940a04f7827e3a656)
2010-05-25 13:27:17 +01:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
Mike Antipov 7439332656 EXT-6710 FIXED Implemented functionality to give multiselected inventory items to several selected avatars in avatar picker:
1. Select items to share
2. Click Share; Resident chooser opens
3. Select residents to share with, click SELECT
4. Selected items are transferred to selected users
5. Pop-up toast confirms transfer

Some implementation notes:
 * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars)
 * Select button is enableв if all selected items can be offered.
 * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:41 +03:00
Mike Antipov 5c370550bf EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.

LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.

There were moved methods related to:
 - give inventory item
 - give inventory category
 - log into chat
Such functionality was moved:
 - is give acceptable
 - do inventory give operation
 - send give inventory request to server
 - process give inventory for protected items

QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:29 +03:00
Nyx Linden 8487341b0f AVP-44 WIP Back-end support for multiwearables
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.

Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Loren Shih 50fad31f09 EXT-7353 FIXED short cuts (links) to textures should show up in the texture picker
Links in general will now show up for all filtered inventory views of their associated types.
2010-05-14 17:31:56 -04:00
Loren Shih dbaaebfe5b EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanup
Const correctness, logic cleanup, took out subclasses redefining same variable as base class (!!!).
2010-05-12 13:46:21 -04:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Loren Shih 64da5083d0 EXT-7306 : FIXED : Add shortcut-style icons for inventory links
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code

Inventory link icons were designed from scratch.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 13:01:27 -04:00
Loren Shih f28887554e EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking")
In viewer2.0, paste as link was only allowed in god mode.  Here, it is allowable if the user sets a debug setting.  This prevents normal users from accidentally screwing up their inventory if they don't understand what a link is.
2010-05-07 16:33:18 -04:00
Loren Shih 183122bc1d EXT-7269 : FIXED : Issue warning dialog when item is deleted that has links pointing to it
Warning now comes up if you try to delete an item that has any item links pointing to it (in memory).  This assumes that the viewer actually knows about those links, which is true at least in 2.0 since links only appear in Outfits folders and this code causes those to be fetched into memory on startup.
2010-05-07 13:44:03 -04:00
Mike Antipov 15413e4442 Fixed major bug EXT-6797 (attempting to create new folder while viewing recent inventory renames newest item instead.)
Implemented Recent Inventory Panel specific classes to create appropriate context menu for Folders in Recent Items Panel:
 * Registered new LLInventoryRecentItemsPanel class
 * Added appropriate Folder Bridge and Bridge Builder

Updated main inventory panel to not show "+" button on Recent Items tab
 * Placed controls into Layout Stack.
 * Change visibility of panel with "+" button while switching between tabs.
 * also made bottom panel wider to be consistent with other side panels (see screenshots).

Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/334/

--HG--
branch : product-engine
2010-05-05 12:29:53 +03:00
Alexei Arabadji 85e3432579 fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)
Added missing 'Delete' button to the Notecard Preview dialog;

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/330/

--HG--
branch : product-engine
2010-04-29 16:09:00 +03:00
Loren Shih ec36c092a2 Compile error fix for missing description field in link_inventory_item. 2010-04-28 14:14:06 -04:00