3a79e9bc22
merge from PE's viewer-release
2010-08-07 12:45:31 +01:00
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
4277bfbba6
CT-575 WIP FR linguistic
2010-08-06 11:17:45 -07:00
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
f36bd31b3d
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-06 09:40:54 -06:00
4682264ead
EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-08-06 09:29:33 -06:00
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
4f91a84c40
Merge from default branch
...
--HG--
branch : product-engine
2010-08-06 16:05:19 +03:00
6d1b892516
merge from PE's viewer-release
2010-08-06 12:28:51 +01:00
bcb7401645
CT-575 WIP IT translation for set16 for Viewer 2.1.1
2010-08-05 11:04:56 -07:00
e4ec91fecd
merge
2010-08-05 16:27:15 +01:00
838dbb9b0f
EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserialize
...
Speculative bunch of robustification.
Reviewed by Soft.
2010-08-05 16:26:39 +01:00
0e673902f4
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-05 08:55:31 -06:00
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
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
2435126081
Merge from default branch
...
--HG--
branch : product-engine
2010-08-05 15:11:27 +03:00
eef6ababcd
merge from PE's viewer-release
2010-08-05 12:39:08 +01:00
cd628d8ea8
merge the fix of SNOW-793: memory leak in LLImageFormatted::appendData
2010-08-04 16:58:21 -06:00
057568bddc
CT-575 WIP FR translation for set16 for Viewer 2.1.1
2010-08-04 15:35:13 -07:00
2a8e330605
merge
2010-08-04 17:22:50 -04:00
e6d5cc3bd1
EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during some merge
2010-08-04 17:21:33 -04:00
b4b503d4ac
Merge
2010-08-04 12:52:06 -07:00
b3fd508cff
CT-575 WIP PT translation for set16 for Viewer 2.1.1
2010-08-04 12:51:12 -07:00
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
aaa41211c8
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-04 11:19:39 -06:00
68bb4e3f6a
Propagate version bump to 2.1.1
2010-08-04 10:14:22 -07:00
8f56413c91
more fix for EXT-7397: decoding textures get stuck in REQ status
2010-08-04 10:55:07 -06:00
cf58852a5e
automated merge
2010-08-04 10:22:01 -04:00
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
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
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
80b37e50fa
Merge
2010-08-04 13:19:31 +01:00
fd4cbed787
DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ... oopsie.
2010-08-04 13:18:16 +01:00
e77ac4ca64
Merge
2010-08-04 12:56:41 +01:00
d3db9dd2a1
DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object geometry
...
Encapsulated building of the cache filename into a help function to prevent code
duplication.
Reviewed by Tofu.
2010-08-04 12:52:44 +01:00
dea1266370
merge from PE's viewer-release
2010-08-04 11:53:28 +01:00
e3a33b068d
EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after it was opened by 'Replace' item of context menu)
...
Restored from BAD MERGE at 5b5cc4a8642d
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/750/
--HG--
branch : product-engine
2010-08-04 11:38:29 +03:00
eefe3388da
Update version to 2.1.1
2010-08-03 23:41:08 -04:00
08b74c369f
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-03 18:27:58 -06:00
85c970e847
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-03 18:26:47 -06:00
a7a5a90852
Pulled build.sh change from viewer-release
2010-08-03 17:08:43 -07:00
4b2f46af40
CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1
2010-08-03 14:59:14 -07:00
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
ae4bc473e5
CT-575 FIX linguistic work from q/viewer-release lost in dessie/viewer-release. Re-comitting.
2010-08-03 11:17:35 -07:00
e2135bd6dd
Merge from default branch
...
--HG--
branch : product-engine
2010-08-03 16:28:58 +03:00
4f2641aef0
merge from PE's viewer-release
2010-08-03 13:33:06 +01:00
d10b9a7f37
Pulled from "dessie/viewer-release"
2010-08-02 22:05:56 -07:00
b3b8ef25e1
Eliminate the bad merge at "2026f824953f"
2010-08-02 17:03:55 -07:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
4f6e814eaa
Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard
2010-08-02 15:57:01 -07:00
Tofu Linden