Commit Graph

172 Commits (ae79bc0da2e01eb07f5adbb6ecfd4e9a66cd8501)

Author SHA1 Message Date
Tonya Souther 397ab96200 Fix crash when item just added to inventory is renamed. From Henri Beauchamp, adapted to Phoenix by Ansariel Hiller. From PHOE-2529. 2011-02-22 19:47:52 -06:00
Arrehn cb3d43678b Catching up 2.4 merge effort with some late-committed changesets that slipped through.
NOTE: RLVa definitely broken, needs to be merged from catznip
2011-01-18 09:08:10 -05:00
Kitty Barnett 212792f797 Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-10-30 01:41:33 +02:00
Kitty Barnett 37b68114fd - fixed : drag-and-drop wear behaviour of an attachment onto self isn't consistant with the drag-and-drop behaviour of wearables
-> normal-drop : replace wear
    -> Ctrl-drop   : add wear

--HG--
branch : Appearance-Misc
2010-09-28 15:06:32 +02:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Leyla Farazha 854e6acb42 Merge with dessie/viewer-release 2010-07-30 18:07:35 -07:00
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
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Tofu Linden fe91462d62 merge from PE's viewer-release 2010-07-26 10:07:35 +01:00
Mike Antipov c136e575e2 EXT-8394 FIXED Added "New Note" to dictionary of predefined Inventory items/folders.
"New Note" should be translated on other languages in strings.xml

 Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/795/

--HG--
branch : product-engine
2010-07-23 17:21:53 +03:00
Loren Shih 056685d9d4 automated merge 2010-07-23 10:13:11 -04:00
Loren Shih 75cfa9a0c3 EXT-8051 FIXED Change cameraCustomizeAvatar calls to use gAvatarp->isUsingBakedTextures
Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22 15:06:08 -04:00
Mike Antipov f6c08d4510 EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item is still valid when landmark is loaded from notecard and 2) adding a check for region capability
There are two reasons of the crash reported in the bug:
 * absence of the "CopyInventoryFromNotecard" capability in region (which leads to crash while logging of a LL_ERRS)
 * referencing to an invalid pointer to LLInventoryItem in callback.


The first issue is fixed by preventing sending of the "CopyInventoryFromNotecard" message if it is not supported
 (in the "copy_inventory_from_notecard()")

The second issue caused by such reason:
 * Notecard stores LLPointer to each embedded inventory item
 * When Landmark is clicked it should be opened in Places Panel and inventory item should copied into agent inventory
 * If it is unknown to agent it is requested and pointer (but not LLPointer!) to inventory item was bound to an appropriate callback
 * Then when landmark is loaded that inventory item is copied to inventory.
 * If notecard was closed before callback was trigged all instances to embedded inventory items were destroyed.
This leads to crash when trigged callback tries to reference to bound pointer to inventory item (for landmarks)

Fix is to pass LLPointer instead of pointer to inventory item into callback to ensure item is valid when it is needed.
Details:
 * updated LLEmbeddedItems::getEmbeddedItem() to return LLPointer to inventory item (and renamed to getEmbeddedItemPtr)
 * updated LLViewerTextEditor::openEmbeddedItem() to get LLPointer to inventory item
 * updated LLViewerTextEditor::openEmbeddedLandmark() to get LLPointer to inventory item

Patch also contains some more places where pointer is replaced with LLPointer to be consistent.

NOTE: there are several LLViewerTextEditor::openEmbeddedXXX() methods which still get pointer to inventory item.
 It is safe for now because they use it synchronously. I have added a note at their declaration.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/784/

--HG--
branch : product-engine
2010-07-22 12:46:57 +03:00
Richard Linden 28bd15d47d Merge from dessie/viewer-release 2010-07-27 14:44:17 -07:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Mike Antipov 8dea26aa6c EXT-8364 FIXED Added more predefined system strings to be translated into dictionary.
They are 4 from ticket and 3 more from library->gestures category:
* "New Gesture"
* "Female - Chuckle"
* "Female - Cry"
* "Female - Embarrassed"
* "Female - Hey baby"
* "Female - Looking good"
* "Female - Over here"
* "Female - Please"

Also added missing string to be localized: "InvFolder Initial Outfits"

They should be translated then.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/756/

--HG--
branch : product-engine
2010-07-15 11:03:07 +03:00
Mike Antipov 14724102f3 EXT-8319 FIXED Added method to localize inventory categories having predefined names, updated predefined keys for "Male - Get lost" and "Female - Get lost".
There were two issues:
 * "Male - Get lost" and "Female - Get lost" gestures have by 2 spaces before "-" in their names.
 * Folders were not processed to be localize. This was not implemented correctly in EXT-7051.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/753/

--HG--
branch : product-engine
2010-07-14 16:25:17 +03:00
Richard Nelson 1ec1ee9bdf merge 2010-07-12 11:24:05 -07:00
Brad Payne (Vir Linden) 7380d8f1cb EXT-8238 FIX - unfortunately this won't have much impact on crash rates, since the problem occurs when we're already shutting down 2010-07-08 10:53:39 -04:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Richard Nelson 3fc3773ab8 EXT-7991 FIX Crash if exit before outfit autopopulate completes
reviewed by Leyla
2010-06-25 14:57:42 -07:00
Leyla Farazha c897061856 Merge with q/viewer-release 2010-06-21 10:21:52 -07:00
Brad Payne (Vir Linden) 347e88961c EXT-4919 WIP - populating new users with more gestures, and activating appropriate ones 2010-06-17 17:37:28 -04:00
Vadim Savchuk d17b616b1c EXT-7627 FIXED Wearing an item now doesn't open the wearable editing panel.
Fix:
- Save the UUID of a newly created wearable to start editing it right after it gets worn.
  This approach replaces a temporary hack that invoked the editing panel whenever an item gets worn
  (if the Appearance SP is opened at the time).
  The hack only happened to work sometimes because the editing panel failed to open.

Other changes:
- Removed a check for inventory item completeness from LLAgentWearables::editWearable().
  because the check often fails and doesn't appear to be needed at all.
- Added warning messages to LLAgentWearables::editWearable() so that it's easier to debug.
- Replaced duplicated code in LLPanelOutfitEdit::onEditWearableClicked() with a call to gAgentWearables.editWearable().

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

--HG--
branch : product-engine
2010-06-08 17:01:29 +03: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
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -07:00
Mike Antipov b52527de3a merge
--HG--
branch : product-engine
2010-06-03 12:53:54 +03:00
Mike Antipov 5459e26392 EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first openning, updated reliability of LLInventoryFetchItemsObserver
* Moved initialization (with start fetch) of the LLFilteredWearableListManager into LLPanelOutfitEdit::onOpen
* LLFilteredWearableListManager::changed now ignores non-related inventory changes (CALLING_CARD, GESTURE, SORT)

Tried to fix an issue with empty Gesture list on startup with clean inventory cache.
Reason: logic is based on count of "inventory changed" events. In case of there was too many requests requested items can be removed from queue by mistake.
* Increased a number of the "change()" method calls to wait fetched items.
  Unfortunately this only works if My Inventory category does not have too many children. An does not work if it has 2000+ items
  Logic to remove item from the incompleted list should be based on timer and number of attempts.

Also add some debug information about fetching inventory category and its content to log.

Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/

--HG--
branch : product-engine
2010-06-03 12:47:18 +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
Yuri Chebotarev f8d2fa4ca8 EXT-7528 FIX fix typo
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/491/

--HG--
branch : product-engine
2010-06-02 11:29:49 +03:00
James Cook 49c221b967 Merge with dessie/viewer-public in prep to land code there 2010-06-01 14:33:44 -07:00
Loren Shih 955698c7a6 automated merge 2010-05-28 10:41:17 -04:00
Loren Shih 8ac65297f6 EXT 7525 FIXED Took out overaggressive warning when querying whether an item is a wearable. 2010-05-27 16:40:09 -04: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) 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) 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
Richard Nelson 2920d4c46f merge 2010-05-24 16:37:52 -07:00
Yuri Chebotarev 1e48e25558 EXT-7051 additional fix - add more hardcoded words to translated dictionary
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/414/

--HG--
branch : product-engine
2010-05-20 10:45:39 +03:00
Leyla Farazha ac17ec0c28 Merge pull from dessie/viewer-public 2010-05-19 15:58:56 -07:00
Loren Shih 46d799ab51 automated merge 2010-05-18 10:18:03 -04:00
Yuri Chebotarev e462c90db6 EXT-7051 FIX Add more server hardcoded strings to localization dict.
--HG--
branch : product-engine
2010-05-17 09:22:08 +03:00