Commit Graph

11427 Commits (f369ebec244f57205d0a9c835d4184c827e7b50f)

Author SHA1 Message Date
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 40eda71ff0 merge from PE's viewer-release 2010-08-13 12:39:47 +01:00
Xiaohong Bao 0742f89208 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-12 21:53:30 -06:00
Xiaohong Bao 4627c4b698 Fix for EXT-8578: Blurry image in profile never resolves - texture queue problem? 2010-08-12 21:52:22 -06:00
Vadim Savchuk 44adcdecd0 EXT-8473 FIXED Fixed renaming inventory items without hitting Enter.
Problem:

The bug was caused by the fix of EXT-6682 that prematurely forgets the item
being renamed (by resetting mRenameItem) whenever the renamer input field loses focus.
That's why we couldn't actually finish renaming item.

Fix:

The code is quite messy, but I'll try to explain.

There are three cases when we should hide the renamer:
1) ESC key is hit (just hide).
2) ENTER key is hit (rename, then hide).
3) renamer loses focus (rename, then hide).

In the first two cases we manually remove the renamer from the popups
list -- by calling gViewerWindow->removePopup(mRenamer).
In the third case that's done automatically.
So, in all cases the onRenamerLost() pop-up is called that hides the renamer
and only *then* resets mRenameItem.
Not only this approach fixes the bug -- I hope it's a bit more straightforward too.

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

--HG--
branch : product-engine
2010-08-12 16:16:57 +03: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
Tofu Linden 4281e2bd01 EXT-8589 FIXED Nothing happens if choose 'Invite to Group' from avatar's 3D context menu
The groups-chooser was auto-closing when the IW selection was lost, which in the case of right-clicking on (other) avatars is immediately.  The 'hg blame' is lost in merge-fubarism so I can't track why this behaviour was ever introduced, but I can think or (or find) no reason to autoclose in this case - the groups picker dialog doesn't even use the current selection, let alone care if it's lost.
2010-08-12 14:12:54 +01:00
Sergei Litovchuk dd692f17ab EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point.
Worked around by checking gAgentAvatarp for being valid.

I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work.

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

--HG--
branch : product-engine
2010-08-12 15:56:51 +03:00
Tofu Linden 6c79b84600 merge from PE's viewer-release 2010-08-12 12:51:00 +01:00
Paul Guslisty 7a0b016c8c EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable

- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name

- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Restored diff after bad merge at 13817

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

--HG--
branch : product-engine
2010-08-12 13:48:36 +03:00
Xiaohong Bao 11c4985674 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-11 19:32:00 -06:00
Xiaohong Bao 5be5c3f0da fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5 and
EXT-7397: decoding textures get stuck in REQ status
2010-08-11 19:31:20 -06:00
Loren Shih bd9ead6794 automated merge 2010-08-11 13:55:39 -04:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code

Lots of files changed, but this is mostly just a trivial function call rename.  This change is very low risk.
2010-08-11 12:34:27 -04:00
Vadim Savchuk bf1df45f61 Merge from default branch
--HG--
branch : product-engine
2010-08-11 16:32:04 +03:00
Tofu Linden f9a61bd30d merge from PE's viewer-release 2010-08-11 13:42:42 +01:00
Eli Linden 766eaf9a50 EXT-8376 FIX en_xui_change for IT truncation; DE fix 2010-08-10 17:21:36 -07:00
Eli Linden 205a5c6083 Merge 2010-08-10 16:11:28 -07:00
Eli Linden 10641acf4c EXT-8370 WIP remove old overrides 2010-08-10 16:09:11 -07:00
Xiaohong Bao 0582257a8a Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-10 16:44:12 -06:00
Xiaohong Bao b9cc3a34da EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5 2010-08-10 16:43:31 -06:00
Eli Linden f5ae33fa53 CT-575 WIP restore PL translation that got lost 2010-08-10 15:24:16 -07:00
Vadim Savchuk 863e380fb6 EXT-8576 FIXED Only attachments are worn if multi-select items on 'My Outfits' tab and press 'Wear' button.
Reason: avatar appearance was not updated if the last selected item was an attachment.
Fix: make sure appearance is updated afterwards, regardless of items types.

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

--HG--
branch : product-engine
2010-08-10 22:38:29 +03:00
Vadim Savchuk 9d6fd1c63f Merge from default branch
--HG--
branch : product-engine
2010-08-10 16:11:33 +03:00
Tofu Linden 8a577f1a1c (empty) merge from PE's viewer-release 2010-08-10 13:57:16 +01:00
Xiaohong Bao f2fd3b8a2f Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-09 17:08:28 -06:00
Xiaohong Bao 8af410aca2 EXT-8596: FIXED: crash at LLTextureFetchWorker::doWork(int) [secondlife-bin lltexturefetch.cpp] line 1061 2010-08-09 17:07:34 -06:00
Eli Linden e56bd45f0d CT-575 WIP PL global edit part 1/2; PL DA set 16 translation for 2.1.1; FR linguistic 2010-08-09 15:06:26 -07:00
Tofu Linden 90a73085fd EXT-8597 FIXED [crashhunters] LLVorbisDecodeState::initDecode()
not for certain fixed, but some robustification.
2010-08-09 16:14:12 +01:00
Vadim Savchuk fcc19791b3 Merge from default branch
--HG--
branch : product-engine
2010-08-09 16:15:59 +03:00
Tofu Linden b22b042edd merge 2010-08-09 14:14:16 +01:00
gabriel lee c70b05082f patching from fixes made in dessie/viewer-release 2010-08-09 12:44:28 +01:00
Tofu Linden 3a79e9bc22 merge from PE's viewer-release 2010-08-07 12:45:31 +01:00
Monroe Linden bcd8443371 Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel().

Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06 20:06:16 -07:00
Eli Linden 4277bfbba6 CT-575 WIP FR linguistic 2010-08-06 11:17:45 -07:00
Paul Guslisty c187fdcf1f EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Recovered from bad merge in 13811

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

--HG--
branch : product-engine
2010-08-06 19:41:23 +03:00
Xiaohong Bao f36bd31b3d Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-06 09:40:54 -06:00
Xiaohong Bao 4682264ead EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp] 2010-08-06 09:29:33 -06:00
Tofu Linden 0a3493db08 EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDs
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
2010-08-06 14:28:26 +01:00
Vadim Savchuk 4f91a84c40 Merge from default branch
--HG--
branch : product-engine
2010-08-06 16:05:19 +03:00
Tofu Linden 6d1b892516 merge from PE's viewer-release 2010-08-06 12:28:51 +01:00
Eli Linden bcb7401645 CT-575 WIP IT translation for set16 for Viewer 2.1.1 2010-08-05 11:04:56 -07:00
Tofu Linden e4ec91fecd merge 2010-08-05 16:27:15 +01:00
Tofu Linden 838dbb9b0f EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserialize
Speculative bunch of robustification.
Reviewed by Soft.
2010-08-05 16:26:39 +01:00
Xiaohong Bao 0e673902f4 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-05 08:55:31 -06:00
Vadim Savchuk 46334b6310 EXT-8309 FIXED Incorrect French date format in place profile and status bar.
Changes:
- Added support for formatting day of the month without leading zero ("sday").
- Changed date format in place profile (landmark info) and in the top status bar
  according to bug reporter's request.

Technical details:
Actually implementation of strftime() in Linux and Windows supports stripping the
leading zero (with "%-d" and "%#d" respectively).
But that's not supported in MacOSX, so I had to reimplement it.

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

--HG--
branch : product-engine
2010-08-05 15:57:19 +03:00
Andrew Dyukov 4701fc0a18 EXT-8553 FIXED Substituted "Object Profile" menu item label by "Item Profile" in My Outfits.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/836/

--HG--
branch : product-engine
2010-08-05 15:49:06 +03:00
Vadim Savchuk 2435126081 Merge from default branch
--HG--
branch : product-engine
2010-08-05 15:11:27 +03:00
Tofu Linden eef6ababcd merge from PE's viewer-release 2010-08-05 12:39:08 +01:00