Vadim Savchuk
bf1df45f61
Merge from default branch
...
--HG--
branch : product-engine
2010-08-11 16:32:04 +03: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
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)
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
Loren Shih
cf58852a5e
automated merge
2010-08-04 10:22:01 -04:00
Loren Shih
0f3286af36
EXT-8550 DONE Rewrite "You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds." for localization
...
Split this into two messages to take out ACTION as requested.
2010-08-04 10:21:20 -04:00
Vadim Savchuk
75e76ea248
EXT-8524 FIXED Non-ASCII character corruption in date.
...
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this).
See http://jira.secondlife.com/browse/EXT-8318 for more details.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/
--HG--
branch : product-engine
2010-08-04 16:52:22 +03:00
Tofu Linden
11f4732106
EXT-8548 FIXED Login screen contains invisible field which blocks keyboard-only login
...
The panel_layout itself was taking focus by default (hmm).
2010-08-04 14:26:44 +01:00
Aimee Linden
80b37e50fa
Merge
2010-08-04 13:19:31 +01:00
Aimee Linden
fd4cbed787
DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ... oopsie.
2010-08-04 13:18:16 +01:00