Commit Graph

44 Commits (19c0d6d4eaf21cbfc96d7057c11db35edf73f2fe)

Author SHA1 Message Date
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Vadim Savchuk 7598015945 EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.

Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.

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

--HG--
branch : product-engine
2010-07-27 22:34:34 +03:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Sergei Litovchuk f790036002 EXT-8190 PARTIAL FIX Fixed loading indicator infinite spins upon pressing 'Save' for outfit with non-link items.
- Added inventory collector functor to select items by their actual type.
- Fixed outfit "dirtiness" calculation so only link items are checked.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/728/.

--HG--
branch : product-engine
2010-07-10 00:34:36 +03:00
Tofu Linden 297bab71ab CID-495
Checker: FORWARD_NULL
Function: show_item_original(const LLUUID &)
File: /indra/newview/llinventoryfunctions.cpp
2010-07-05 12:04:28 +01:00
Loren Shih 3fca4b0d61 automated merge 2010-06-28 12:32:21 -04:00
Monroe Linden 8d18056e82 Fix for EXT-8025 ('+' button on My Appearance > Edit Outfit panel does nothing)
Button now gets disabled in the early-exit case in LLPanelOutfitEdit::onInventorySelectionChange().

onInventorySelectionChange() also uses the new predicate get_can_item_be_worn(), which both checks whether the item is already being worn and whether it's of a type that could be worn.

Reviewed by Nyx at http://codereview.lindenlab.com/2451030 .
2010-06-25 16:04:45 -07:00
Loren Shih 9139238500 EXT-7914 FIXED Current outfit can be removed via My Inventory -> Trash button
Now disabling remove if an outfit is linked in the COF.
2010-06-25 16:07:27 -04:00
Vadim Savchuk a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Richard Nelson b52044cf26 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-17 15:54:27 -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
Yuri Chebotarev 9eeaaf6738 EXT-7791 FIX Show inventory panel if its not visible.
reviewed by Mike Antipov, Loren Shih at https://codereview.productengine.com/secondlife/r/599/

--HG--
branch : product-engine
2010-06-17 11:02:12 +03:00
Richard Nelson 4aef5f54de EXT-7734 FIX In-world object properteis often don't show correct information
reviewed by Leyla
2010-06-16 17:32:51 -07:00
Yuri Chebotarev a66ec792c9 EXT-7790 FIX Reset inventory filter when showing original item in inventory
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/

--HG--
branch : product-engine
2010-06-16 10:10:59 +03: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
Vadim Savchuk 59496719bb Removed an obsolete comment.
Requested by Richard: https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-03 20:42:08 +03:00
Vadim Savchuk 142a6c3b8f EXT-6726 WIP Added missing menu items to the Appearance SP.
- Hooked up Wear / Take off / Rename / Delete items in the My Outfits gear menu.
- Added "Create new..." to body part / clothing context menu in Edit Outfit.
- Added "Create new..." submenus to the Edit Outfit gear menu.
- Disabling the "Take Off" menu item of the clothing context menu in the Edit Outfit panel when it's irrelevant.

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

--HG--
branch : product-engine
2010-06-02 20:46:16 +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
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml

--HG--
branch : product-engine
2010-05-31 16:18:22 +03:00
Paul Guslisty d42fd6cf7f EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable items and by selecting 'Replace' menu item click body part context menu
Main changes:
- Added callback for a '(+) button' to the LLCOFCallbacks and bind it with LLPanelOutfitEdit::onAddWearableClicked
- Created the callback(LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked) for 'Replace' menu item of context menu

Related changes:
- Changed LLFilteredWearableListManager so that it can use different functors (subclasses of LLInventoryCollectFunctor) as a criterion for LLInventoryItemsList filtering. Before it used only LLFindNonLinksByMask filter. Moved LLFindNonLinksByMask from to the llfilteredwearablelist.cpp to the llinventoryfunctions.h
- Created getter 'LLPanelDummyClothingListItem::getWearableType()' for LLPanelDummyClothingListItem
- Made 'add wearables panel' a member of LLPanelOutfitEdit so that not to use findChild each time panel is needed

Reviewed by Igor Borovkov at http://jira.secondlife.com/browse/EXT-7472

--HG--
branch : product-engine
2010-05-28 20:10:10 +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
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
Loren Shih ee53b612fb EXT-7324 : INFRASTRUCTURE: Inventorymodel code cleanup
Superficial header file cleanup
Lots of moving functions around and recategorizing in LLInventoryModel.h
Removed some obsolete functions, changed scoping of others
Moved some static functions from LLInventoryModel into llinventoryfunctions.h
2010-05-12 16:46:28 -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 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
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 b49165a9dd EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup for LLInventoryFunctions.

Change made to simulator files as well.
2010-04-05 16:16:13 -04:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Loren Shih d7002c0695 EXT-3529 : INFRASTRUCTURE : Move LLFindWearables code and others into LLInventoryFunctions
These functions are defined in LLInventoryFunctions.h but their implementation is in LLInventoryBridge...  moved everything to LLInventoryFunctions.
2010-03-30 16:24:18 -04: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 b6e7850c0a Merge 2010-03-29 12:30:09 -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
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -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
Loren Shih 99b29fc394 EXT-5332 : Fix coverty whine on break statement fallthrough - LLInventoryFunctions.cpp
Mandated by Tofu to fix a break statement fallthrough for coverty.  This is not my team's code but I was happy to fix it.
BTW: This does not result in any functionality change, so it is makes no difference outside coverty whether we get this into viewer2 versus viewer2.1.
Reviewed by: Vir
2010-02-11 12:00:49 -05:00
Mike Antipov b3763f1ec1 Cleaned up including of the "llviewerinventory.h"
--HG--
branch : product-engine
2010-01-27 18:40:19 +02:00
Ychebotarev ProductEngine 82de841c52 merge
--HG--
branch : product-engine
2010-01-19 17:13:21 +02:00
Ychebotarev ProductEngine f28778b8b8 work on EXT-4322 Remove the Communicate floater
leave some LLFloaterChat usages commented for later review...

--HG--
branch : product-engine
2010-01-18 17:50:19 +02:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
Loren Shih 7796fc6748 EXT-3527 : Centralize calls to getIsItemWorn
Moved function from llinventorybridge to llinventoryfunctions.

--HG--
branch : avatar-pipeline
2009-12-16 16:36:40 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih 0dd9871012 merge
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -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