Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Vadim Savchuk 3a1400015a Merge from default branch
--HG--
branch : product-engine
2010-03-18 15:17:49 +02:00
Richard Nelson 76dc796a1a merge 2010-03-17 18:20:20 -07:00
Richard Nelson d9c64d2213 fix for radio item not being selected after picking internal browser
reviewed by Callum
2010-03-17 18:19:31 -07:00
Eli Linden 0f5c779063 Merge 2010-03-17 17:59:17 -07:00
Eli Linden c92dd09653 VWR-18199 en_xui_change 2010-03-17 17:58:07 -07:00
Richard Nelson 19034f5cd7 merge 2010-03-17 17:48:11 -07:00
Richard Nelson 121114f934 EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit to Viewer Prefs
had to fix how radio groups bind to saved settings to support changing radio item order

tested all existing radio groups bound to a saved setting

reviewed by Callum
2010-03-17 17:46:15 -07:00
Eli Linden 7e5db3084e FR linguistic; JA cycle8 translation for beta 5 2010-03-17 17:34:47 -07:00
Sergei Litovchuk 729f880f78 [SHOWSTOPPER] Fix for (EXT-4704) Add maturity icons to Prefs -> General and (EXT-4705) Show maturity icon on Region/Estate tab.
- Made changes to combobox onItemSelected() to fix (EXT-6269) typing a location into the nav bar always sends you to the first location you typed in.
- Replaced LLIconsComboBox pointers with base class pointers LLComboBox.

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

--HG--
branch : product-engine
2010-03-18 00:53:32 +02:00
Xiaohong Bao 56ccf4d0be fix for EXT-6420: crash at LLImageRaw::LLImageRaw [secondlife-bin llimage.cpp:271] 2010-03-17 16:41:28 -06:00
Eli Linden 9690d5385d Merge 2010-03-17 15:32:12 -07:00
Eli Linden 72fc80306b VWR-17383 en_xui_change 2010-03-17 15:31:18 -07:00
Andrew Dyukov 17421a30d4 Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs translation)- removed unnecessary symbol in xml
which was occasionally introduceded in 10453:cbac8ca300e0.

--HG--
branch : product-engine
2010-03-18 00:29:52 +02:00
Andrew Dyukov 6a871271ca Partial fix for EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs translation) - only changes to
strings.xml are commited to make sure they make their way to localization. Code changes are to follow. Discussed at
https://codereview.productengine.com/secondlife/r/55/

--HG--
branch : product-engine
2010-03-18 00:10:18 +02:00
Loren Shih 896b88063e EXT-6252 : "Duplicate items (not links) in inventory are both displayed in bold as (worn) when only one is actually worn"
Simple special-case fix for this specific issue, although I added a comment to llwearablelist.h that eventually the whole LLWearableList class will need some redesign.
Core issue is that you can have multiple itemIDs pointing to the same assetID and LLWearableList doesn't account for this possibility during lookup-wearable-by-assetID operations.
2010-03-17 17:55:12 -04:00
Palmer Truelson 86229c1b57 merge 2010-03-17 14:23:53 -07:00
Palmer Truelson fd749ea7d5 EXT-6419 Adding comma to viewer stats texture time output 2010-03-17 14:23:40 -07:00
Leyla Farazha 11e6e208d4 Adding error handling to share to web feature.
Reviewed by Callum
2010-03-17 14:21:58 -07:00
Xiaohong Bao 8e1f7ecaf3 more for lltexturecache.cpp: fix the crash due to deleting the entries header file after clearing the texture cache. 2010-03-17 14:43:17 -06:00
Eli Linden 1e713c886c Merge 2010-03-17 13:24:13 -07:00
Monroe Linden b54c7b525b Fix for EXT-5975: don't display a toast warning for none/none parcel media mime type
Modified LLParcelMediaAutoPlay and LLParcelMedia so that it should no longer attempt to create media instances when the media type is set to "none/none".

Also, made LLViewerParcelMedia::getURL() return an empty string when the media type is none/none, which should make the UI better reflect the fact that it won't be loaded.

Reviewed by Callum at http://codereview.lindenlab.com/686010
2010-03-17 13:03:37 -07:00
Tofu Linden 49bb6eebe8 linux parts for EXT-4819 [NUX] New Application Icon Integration 2010-03-17 19:27:20 +00:00
Palmer Truelson e898ec97a2 EXT-6419 : Adding texture time metric to viewer stats
Reviewed by Mani
2010-03-17 12:20:57 -07:00
Eli Linden 6eb0049671 EXT-2180 IT set2 final edit for beta5 2010-03-17 12:09:13 -07:00
Tofu Linden 0a35c31e51 PE merge 2010-03-17 19:05:33 +00:00
Tofu Linden c17152c21e PE merge. 2010-03-17 18:58:39 +00:00
Xiaohong Bao f8dc23fc84 fix for EXT-6093: crash at LLTextureCache::updateTextureEntryList[secondlife-bin lltexturecache.cpp:847];
EXT-5711: Some textures loading from cache seems jammed;
EXT-5599: Viewer crashes consistently, in Linden Homes region.
2010-03-17 12:39:39 -06:00
Eli Linden d59038e535 Merge 2010-03-17 11:00:44 -07:00
Loren Shih 6e761bb5f2 automated merge viewer2.0->viewer2.0 2010-03-17 13:35:39 -04:00
Paul Guslisty 03f58118ce Fixed normal EXT - 5985 ([TRANSLATED BUT IN EN] - Attachement points need localization)
- Applied localization to the label string

Reviewed by Mike Antipov in https://codereview.productengine.com/secondlife/r/53/

--HG--
branch : product-engine
2010-03-17 18:39:27 +02:00
Lynx Linden 509457b8ef EXT-6335: Add custom labels for specific agent SLapp commands.
We now display custom labels and tooltips for the various
secondlife:///app/agent SLapp suffixes that we support. These include:
/mute, /unmute, /pay, /im, /offerteleport, and /requestfriend. For
example, entering:

secondlife:///app/agent/3e2d81e8-6269-8100-860e-c64e5cee3c2c/mute

Now displays the SLapp in text chat as "Mute <Name>", rather than
simply "<Name>".
2010-03-17 15:13:08 +00:00
Mike Antipov 787036881a Completed normal task EXT-6266 ([EN XUI REWORK] in build menu tab titles -- need 'en' xui xml designer rework for multiple languages)
* Increased max width of tabs from 54 to 100 px to accommodate all tabs' labels.

Note: scroll arrows appear for all locales. Full redesign is required for the Build floater

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

--HG--
branch : product-engine
2010-03-17 16:49:23 +02:00
Alexei Arabadji 00b8bdfe60 Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
--HG--
branch : product-engine
2010-03-17 16:31:05 +02:00
Alexei Arabadji 31370e1aae fixed EXT-6373 “Consecutive offer messages are unreadable in the IM log”,
added spacer panel for IM chat plaintext mode;

--HG--
branch : product-engine
2010-03-17 16:27:35 +02:00
Igor Borovkov b240270552 added my landmarks auto-expansion when new folder gets created EXT-6289 (Clicking the plus button in the Places side panel only lets you add landmarks not folders)
added auto-expanding My landmarks Tab when it is closed and Add folder menu item is clicked

Reviewed by Mike at https://codereview.productengine.com/secondlife/r/10/

--HG--
branch : product-engine
2010-03-17 16:03:22 +02:00
Igor Borovkov 4a1857886b fixed EXT-6303 [TRUNCATION] Side bar: People > Recent - Time. Need xui designer to adjust width.
increased width of the "last interaction" text editor to accomodate two japanese hieroglyphs
when 2 digit number is shown

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

--HG--
branch : product-engine
2010-03-17 15:57:36 +02:00
Dmitry Zaporozhan 3fa6c94511 Removed unnesessary include
--HG--
branch : product-engine
2010-03-17 15:46:55 +02:00
Mike Antipov 962521ec19 Fixed normal task EXT-6403 [TRUNCATION] [EN XUI REDESIGN] - Menu Einstellungen, Tab Sound & Medien: Stummschalten, wenn minimiert is truncated
* Increased floater width from 620 to 658 px to accommodate it to checkbox label width.
* Updated "Busy mode response" (on General tab) texteditor and "Always show" & "Never show" lists (on Notifications tab) to be looks better on a wider width.
* Content of other panels was not redesigned.

--HG--
branch : product-engine
2010-03-17 15:25:53 +02:00
Vadim Savchuk 28f208dd87 merge
--HG--
branch : product-engine
2010-03-17 15:02:52 +02:00
Vadim Savchuk 082e9b2d41 Merge from default branch
--HG--
branch : product-engine
2010-03-17 15:02:09 +02:00
Paul Guslisty 69491cccae Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My Appearance > Wearing tab - where it's linked description)
- Replaced hardcoded '(active)' string with [GESLABEL] arg. <string name=\"ActiveGesture\" value=\"[GESLABEL] (TRANSLATION OF 'active')\"/> - this line with translation should be added to the rest locales

- Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/

--HG--
branch : product-engine
2010-03-17 14:40:50 +02:00
Igor Borovkov 733a9275a6 replaced SL Logo EXT-4819 [NUX] New Application Icon Integration
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/46/

--HG--
branch : product-engine
2010-03-17 14:34:15 +02:00
Paul Guslisty 464092e2c9 Fixed normal EXT - 6028 ( [HARD CODED]? Inventory > Library > \"Accessories\" folder)
Added localization string to the strings.xml for Accessories folder and localization support of Accessories folder from source code (llfolderviewitem.cpp).
<string name=\"InvFolder Accessories\">TRANSLATION TO THE CORRESPONDING LANGUAGE</string>  -- this string should be added to the strings.xml for each locale.

Note: due to Accessories category is created out of viewer & has the FT_NONE type it can not be localized as other protected (system) categories.
 So, hack was provided to check this folder (in a Library) & localize it.

Reviewd by Mike Antipov at https://codereview.productengine.com/secondlife/r/42/

--HG--
branch : product-engine
2010-03-17 14:17:35 +02:00
Dmitry Zaporozhan f4e8d1dfb2 Updated normal task EXT-5905 - Resolving offers.
Mistyped offer name.

--HG--
branch : product-engine
2010-03-17 14:06:03 +02:00
Mike Antipov 632afda4dd Code cleanup: remove superfluous call of the setToolTip method.
These calls were added while working on two separate tickets
 - EXT - 6027 ([TRANSLATED BUT IN EN] Bubble shown when you mouseover on system folder within Inventory > Library) (37baa70ea94b)
 - (EXT-6355) [TRANSLATED BUT IN EN] - Inventory, hovertext of system folders: hovertext isn?t localized. (80b6110ba41e)

--HG--
branch : product-engine
2010-03-17 14:02:54 +02:00
Tofu Linden 8331c1a837 PE merge 2010-03-17 11:51:04 +00:00
Dmitry Zaporozhan b2cc39d462 (work in progress) low task EXT-6377 - Embedded offer panels aren't reshaped by height on IM window resize
Added new Toast panel class for use in IM floater. New class handles IM floater reshape and updates Toast height.

--HG--
branch : product-engine
2010-03-17 13:26:34 +02:00
Igor Borovkov 5cae8140f4 fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert: "MiddleMouse" needs to be localized)
Control value is preserved, it is being localized on presentation

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

--HG--
branch : product-engine
2010-03-17 13:25:18 +02:00
Igor Borovkov 8bf0509959 fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs to be localized
extracted strings used in LLAppViewer::forceDisconnect(...) calls

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

--HG--
branch : product-engine
2010-03-17 13:22:29 +02:00
Mike Antipov 24d95dc0ba Fixed normal task EXT-6021 [HARD CODED] Bubble shown when you mouseover on script within Contents is in EN (task inventory)
* Added new string name="PanelContentsTooltip into strings.xml
* Set this tooltip to LLFolderView inside the Build Tool

Note: Fix for localization of default "New Script" name will be fixed in the EXT-5839.

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

--HG--
branch : product-engine
2010-03-17 10:57:45 +02:00