Commit Graph

250 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
callum fd4708c2c4 MAINT-1150 FIX (Speculative) crash on (shutdown) in LLVOAvatar::avString()
Reviewed by vir
2012-06-20 13:37:38 -07:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Brad Payne (Vir Linden) 681c5de92b SH-3128 FIX - log message cleanup for avatar rezzing 2012-05-02 16:48:09 -04:00
Brad Payne (Vir Linden) 2c0774302b tracking for copy-to-wear inventory failures 2012-04-26 13:18:06 -04:00
Brad Payne (Vir Linden) 1253c11e0b more phase tracking for inventory ops 2012-04-23 11:38:53 -04:00
Brad Payne (Vir Linden) 131fb9219e SH-3044 FIX - change avatar log message to LL_DEBUGS to allow effective toggling when default is INFO 2012-03-16 10:55:42 -04:00
Brad Payne (Vir Linden) 3f4bca6887 SH-3044 - tag avatar log messages LL_INFOS(Avatar) 2012-03-16 10:31:15 -04:00
Brad Payne (Vir Linden) ee758c1da0 SH-2970 WIP - scoped phase tweaking, removed auto-phase-stop on metrics send 2012-03-12 18:55:30 -04:00
Brad Payne (Vir Linden) 7bc698cbec SH-2970 WIP - more phase tracking 2012-03-08 17:07:23 -05:00
Brad Payne (Vir Linden) 80e64f26a1 via richard - fix to keep texture debug console anchored at the top 2012-03-06 15:30:08 -05:00
Brad Payne (Vir Linden) 2ac6aaf760 merge 2012-02-22 10:24:23 -05:00
Brad Payne (Vir Linden) 04caf8c876 SH-2689 WIP - move first_fully_visible static into avatar class, bake-related logging 2012-02-21 17:40:40 -05:00
Brad Payne (Vir Linden) 89752e7649 SH-2968 WIP - more logging 2012-02-17 16:38:08 -05:00
Brad Payne (Vir Linden) 4e081c9689 SH-2968 WIP - log avatar name in more places 2012-02-17 13:43:28 -05:00
Vadim ProductEngine 36aba26615 EXP-1843 WIP Added an option to output avatar rez timing.
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
Richard Linden 62d9db2f21 Automated merge with http://hg.secondlife.com/viewer-development 2011-10-15 18:14:23 -07:00
Aaron Stone cddc9e58dd EXP-625 Speed up initial outfit copy and avatar bake by moving initial gesture copy to LLAppearangeMgr::onFirstFullyVisible(). 2011-10-12 17:36:03 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 3c8b0ab537 EXP-1226 FIXED (Create and register a floater for Appearance side tab)
- Added xml for a new floater Appearance and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-27 22:06:56 +03:00
Leslie Linden 1c57963673 Removed windows line endings to conform to coding policy. 2011-09-12 11:30:24 -07:00
Richard Nelson d10a004432 EXP-1162 FIX We are failing to create the Outfit links from the library initial outfits copied on first login
reviewed by Stone
2011-08-26 14:28:50 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Leyla Farazha 2411a107e7 EXP-628 Inventory floater may be opened by SLApp
EXP-630 My appearance floater may be opened by SLApp
EXP-633 Search floater can be opened by SLApps
2011-04-18 14:22:23 -07:00
Leyla Farazha e3c5d6d553 SOCIAL-635 Hitting enter in viewer after selecting an avatar change causes another avatar change to be initiated 2011-03-08 17:17:26 -08:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Vadim ProductEngine 05c14aa558 STORM-702 FIXED Made it possible to wear partial outfits
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2011-01-04 13:52:29 +02:00
Loren Shih e0d77c277a Automated merge from mesh-development 2010-12-21 10:38:08 -05:00
Brad Payne (Vir Linden) 4bd6edc6b0 SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved onIdle functions to llcallbacklist. 2010-12-20 17:11:34 -05:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Seth ProductEngine 024e5ff235 STORM-559 FIXED crash upon quitting the viewer while an outfit is being saved. 2010-11-09 00:55:44 +02:00
Seth ProductEngine 8a4b7c85c2 STORM-184 FIXED Disabled "Save" command for outfits without name (with "No Outfit" in My Appearance SP). 2010-10-29 22:31:21 +03:00
callum a0e3c4380d EXP-271 FIX Implement slapp functionality for changing avatars 2010-10-21 16:55:15 -07:00
Loren Shih 0440fe4dcc VWR-22695 FIXED Adding attachments messaging is inefficient
Single attachment request are now batched up and sent all at once as a single message.
2010-09-01 12:02:48 -04:00
Vadim Savchuk 75a66a146b EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo.
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/

--HG--
branch : product-engine
2010-08-26 18:59:08 +03: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
Tofu Linden b5a8534116 (final?) hairy merge from viewer-release to viewer-public 2010-08-17 11:41:12 -07:00
Brad Payne (Vir Linden) d77c3e3600 merge 2010-08-13 14:39:04 -04:00
Loren Shih f369ebec24 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr

Removed unused mRegisteredAttachments.  Not sure what this was used for, but it's no longer used.
2010-08-13 11:26:22 -04:00
Loren Shih 5881252ab2 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8688 Automatically detach same object is detected
* EXT-8689 Cleanup detachAttachmentIntoInventory code

When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13 11:12:51 -04:00
Tofu Linden 7f08555143 merge from viewer-release 2010-08-13 12:40:45 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Brad Payne (Vir Linden) 6c1796c105 DEV-52580 WIP: disallow multiple links to the same attachment in updateAppearanceFromCOF() 2010-08-12 11:00:39 -04:00
Vadim Savchuk 5de5510f58 EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are subsets of the current outfit.
We allowed wearing any outfit that contains non-worn items.
Now it appears to be wrong, therefore and I changed condition so that
we allow wearing any outfit (or folder) that contains the full set of body parts.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/855/

--HG--
branch : product-engine
2010-08-12 16:13:48 +03:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
Done:
- 1. Dropped the obsolete "MultipleAttachments" setting.
- 2. Added an "Add" item to the following attachment-related context menus:
     * My Appearance (ex-My Outfits) context menu.
     * Edit Outfit -> Add More context menu.
     * Object in-world context menu.
     * Inventory context menu.
     * Object inspector gear menu.
- 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action.

TODO:
- Ability to attach multiple objects at once from the Add More panel (bulk attach).
- Make sure there's no memleak when you click Wear/Attach in the in-world object context menu
  and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).

Issues:

0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments()
   should replace attachments or add them. Assumed the former.

1. I couldn't verify that adding objects from the object inspector menu works
   because I either could wear an object or see its inspector, not both.

2. > 1. Right-click on an object in your inventory and select "Wear".
   > VERIFY: Attaches the object and replaces whatever's there; asks for
   > confirmation before replacing an existing object.
   I think this is impossible to implement because we don't know in advance
   what point the object will be attached to, so we can't display a confirmation dialog.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/

--HG--
branch : product-engine
2010-08-06 17:14:01 +03:00
Tofu Linden 4e966c1b15 merge from viewer-release 2010-08-04 12:21:34 +01:00
Vadim Savchuk 4b00b98844 EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits consisting of body parts only.
Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu.
They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables.

By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/

--HG--
branch : product-engine
2010-08-03 23:28:51 +03:00