Commit Graph

11819 Commits (32fe67ec2ff41f989d7826f14fed0d66f0c923dc)

Author SHA1 Message Date
Tofu Linden 32fe67ec2f merge from PE's viewer-trunk 2010-08-11 13:44:03 +01:00
Andrew Dyukov 79be630d08 EXT-8255 FIXED Added confirmation dialog when removing items.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/849/

--HG--
branch : product-engine
2010-08-10 19:16:18 +03:00
Tofu Linden 2779d28848 merge from PE's viewer-trunk 2010-08-10 16:31:07 +01:00
Sergei Litovchuk f88890afe5 EXT-3981 FIXED changeset e1e225cd1deb. 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-10 18:21:12 +03:00
Sergei Litovchuk 11517b8320 Backed out changeset: e1e225cd1deb
--HG--
branch : product-engine
2010-08-10 17:39:03 +03:00
Dave Parks e62e31a2f2 Fix for crash when deferred rendering enabled and toggling wireframe.
(transplanted from 3886dff9a2829c7a8957d2cc48742e0678ec06a6)
2010-08-10 09:13:41 -05:00
Vadim Savchuk 0977b27b2b Merge from default branch
--HG--
branch : product-engine
2010-08-10 16:23:15 +03:00
Tofu Linden 77330d5c31 (hairy) merge from viewer-release 2010-08-10 14:04:35 +01:00
Tofu Linden 83f108503a merge from PE's viewer-trunk 2010-08-10 14:02:21 +01:00
Tofu Linden 8a577f1a1c (empty) merge from PE's viewer-release 2010-08-10 13:57:16 +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
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
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
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 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
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
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
gabriel lee c70b05082f patching from fixes made in dessie/viewer-release 2010-08-09 12:44:28 +01: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