Commit Graph

11803 Commits (83f108503aa5a34bf24ef0a167d1b76ba3800a38)

Author SHA1 Message Date
Tofu Linden 83f108503a merge from PE's viewer-trunk 2010-08-10 14:02:21 +01:00
Monroe Linden bd708f82bd Patch on a fix for the llmediadataclient.cpp unit test.
My refactor of LLMediaDataClient caused a crash in the windows unit test.  Change set 92fd90bd795a fixed the crash, but broke the code in question.  This changeset should make the code behave correctly, while removing some premature optimization that I now think didn't properly in the first place.
2010-08-09 16:39:06 -07:00
Vadim Savchuk 2f2a0ad38a 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-09 21:14:07 +03:00
Vadim Savchuk 554d543b02 EXT-8577 FIXED Context menu items for multi-attachments
Changes:
* Implemented bulk-add from My Appearance SP.
* Made 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).
  I stated that in comments.

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

--HG--
branch : product-engine
2010-08-09 18:10:36 +03:00
Vadim Savchuk fe96d9a474 Merge from default branch
--HG--
branch : product-engine
2010-08-09 16:41:02 +03:00
Sergei Litovchuk 7bce6580dc EXT-7593 FIXED Added passing focus to the selected outfit tab when My Outfits tab is open.
- Removed "tab_stop" from outfit tabs to prevent passing focus to a tab chosen by default from LLUICtrl::focusFirstItem(). Besides the order of passing focus between outfit tabs by pressing "Tab" was undetermined.
- Had to remove const from the return of LLAccordionCtrl::getSelectedTab() to use the returned pointer for setting focus.

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

--HG--
branch : product-engine
2010-08-09 15:23:00 +03:00
Andrew Dyukov 55c887225f EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
There were two problems:

1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.

- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.

Fixed this by setting style back to normal only when drawing the last part of the segment.

- Second problem was caused by unusual way of appending link to text in chat history.

Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().

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

--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
Tofu Linden 11e03dece4 merge from PE's viewer-trunk 2010-08-07 12:47:08 +01:00
Tofu Linden f0b1424cb8 merge from viewer-release 2010-08-07 12:46:27 +01:00
Tofu Linden 3a79e9bc22 merge from PE's viewer-release 2010-08-07 12:45:31 +01:00
Tofu Linden 22f65ad046 merge from viewer-release 2010-08-07 12:43:55 +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
Sergei Litovchuk 76922597c2 EXT-4379 FIXED tab_stop parameter initialization that prevented inventory panel from passing focus to folder view's scroll container.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/823/.

--HG--
branch : product-engine
2010-08-06 22:34:18 +03:00
Sergei Litovchuk da1398f26f EXT-3981 FIXED Disabled folder view automatic scrolling while background fetch is in progress.
Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/835/.

--HG--
branch : product-engine
2010-08-06 22:34:10 +03: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 52138b24c5 merge from viewer-release 2010-08-06 15:13:10 +01: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 cb1744dae6 merge from viewer-release 2010-08-06 12:33:08 +01: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 8780c59894 merge 2010-08-05 16:28:11 +01: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
Tofu Linden 07f668fe2b fix a merge conflict I forgot to commit earlier. 2010-08-05 13:31:19 +01:00
Vadim Savchuk 2435126081 Merge from default branch
--HG--
branch : product-engine
2010-08-05 15:11:27 +03:00
Tofu Linden b68f753a75 (hairy) merge from viewer-release 2010-08-05 12:42:12 +01:00
Tofu Linden eef6ababcd merge from PE's viewer-release 2010-08-05 12:39:08 +01:00
Xiaohong Bao cd628d8ea8 merge the fix of SNOW-793: memory leak in LLImageFormatted::appendData 2010-08-04 16:58:21 -06:00
Eli Linden 057568bddc CT-575 WIP FR translation for set16 for Viewer 2.1.1 2010-08-04 15:35:13 -07:00
Brad Payne (Vir Linden) 2a8e330605 merge 2010-08-04 17:22:50 -04:00
Brad Payne (Vir Linden) e6d5cc3bd1 EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during some merge 2010-08-04 17:21:33 -04:00
Eli Linden b4b503d4ac Merge 2010-08-04 12:52:06 -07:00
Eli Linden b3fd508cff CT-575 WIP PT translation for set16 for Viewer 2.1.1 2010-08-04 12:51:12 -07:00
Andrew Dyukov 7253c7eeb1 EXT-7511 FIXED Fixed item selection cropping in Edit Outfit
Restored changeset which was lost after merge 58571b4e704b.

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

--HG--
branch : product-engine
2010-08-04 21:13:11 +03:00
Xiaohong Bao aaa41211c8 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-04 11:19:39 -06:00
Christian Goetze (CG) 55e9785e7b Propagate version bump to 2.1.1 2010-08-04 10:15:15 -07:00
Christian Goetze (CG) 68bb4e3f6a Propagate version bump to 2.1.1 2010-08-04 10:14:22 -07:00
Xiaohong Bao 8f56413c91 more fix for EXT-7397: decoding textures get stuck in REQ status 2010-08-04 10:55:07 -06:00
Sergei Litovchuk 9c2694c682 Backed out changeset: b81927151a18. Fix of EXT-3981 reverted to fix EXT-4379.
--HG--
branch : product-engine
2010-08-04 19:34:55 +03:00
Paul Guslisty 00a8b68d1c Fixed erroneously unrenamed parameter name
--HG--
branch : product-engine
2010-08-06 20:25:57 +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
Paul Guslisty 326ad1933b EXT-8207 FIXED (Unexpected camera zoom occures if scroll location history drop-down list by mouse wheel)
Added parameter for scroll list control that determines opaque of mouse scroll wheel event. Set this parameter to \"true\" in combobox of navigation panel.

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

--HG--
branch : product-engine
2010-08-06 18:50:24 +03:00
Vadim Savchuk e6f58368aa Merge from default branch
--HG--
branch : product-engine
2010-08-06 16:40:03 +03:00