0cd91c3df6
EXT-6267 removing local overrides so EN xui can be properly redesigned
2010-03-16 18:42:09 -07:00
59e4b000a3
merge
2010-03-16 17:56:23 -07:00
b37a1a54fa
turning view deletion spam into a lldebugs
2010-03-16 17:48:29 -07:00
65384d0df5
Fix for build error in media_plugin_example.cpp.
2010-03-16 16:45:25 -07:00
ce242821dc
Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made LLPluginClassMedia queue it up before initializing its LLPluginProcessParent.
...
Made all existing plugins send their texture_params message from this init message instead of the LLPLUGIN_MESSAGE_CLASS_BASE "init" message. (This ensures that they won't start to receive 'size_change' messages until after the init has happened.)
Added "set_user_data_path" and "set_language_code" messages to LLPluginClassMedia.
Made webkit plugin deal with the new messages, when they're sent before it receives the media "init".
Removed the user_data_path and language_code arguments from the init function calls throughout the hierarchy.
Made LLViewerMediaImpl queue up the language code and user data path messages before initializing the media.
Reviewed by Callum at http://codereview.lindenlab.com/687006 .
2010-03-16 16:42:31 -07:00
0917355617
merge
2010-03-16 16:40:07 -07:00
b5b5aa7353
Fixes EXT-1659; disable cancel button once server reports teleport finished.
2010-03-16 16:19:33 -07:00
ec0a2b9849
The movie URLs we were using on movies.apple.com now need to be accessed as trailers.apple.com instead.
2010-03-16 16:16:04 -07:00
d425ccdb97
CT-575 ES translation for set8 for beta5, new file
2010-03-16 16:08:22 -07:00
b7a0b74e2e
CT-575 ES translation for set8 for beta5
2010-03-16 16:08:13 -07:00
ad8384c580
linguistic change; fixing floater_about_land.xml button label translation by removing extra ellipses and the label_selected= attribute as they became out of sync with EN file (must have been due to some kind of tool error in the past)
2010-03-16 15:05:23 -07:00
325a3e05ff
merge
2010-03-16 14:46:29 -07:00
a5639f1dd5
en_xui_change for ES truncation in 'floater animation preview'; undoing ES parameter overrides
2010-03-16 14:13:12 -07:00
a5c43859c3
EXT-5735 : InventorySP doesn't show # of inventory items even when known by viewer
...
Moved # items fetched string into panel_main_inventory (out of floater_inventory) so that it's shared by all inventory views.
2010-03-16 17:11:02 -04:00
ae320d38cd
en_xui_change to fix ES truncation; ES linguistic fix (removing ellipsis in many labels to match EN)
2010-03-16 13:32:18 -07:00
60c4621500
Automated merge from viewer/viewer-2-0
2010-03-16 12:33:25 -07:00
fd98074243
fixing windows line endings
2010-03-16 11:40:45 -07:00
fd6d1e2164
fixing windows line endings
2010-03-16 11:40:17 -07:00
3ac40205e9
Merge
2010-03-16 11:39:25 -07:00
38ab25aed8
Fixed normal bug EXT - 6027 ([TRANSLATED BUT IN EN] Bubble shown when you mouseover on system folder within Inventory > Library)
...
- Added localized string from strings.xml as a tooltip
--HG--
branch : product-engine
2010-03-16 20:27:10 +02:00
9c77de54a0
CT set8 PT translation for beta5, new file
2010-03-16 11:12:18 -07:00
a5a69f748c
CT set8 PT translation for beta5
2010-03-16 11:12:02 -07:00
41ed9b3bcb
New snapshot/social media floater
...
reviewed by Richard
2010-03-16 11:00:36 -07:00
3fa23202b3
EXT-4655 fixed a hanging listener on parcelinfo messages and fixed possible crash through spamming refresh of script limits floater
...
reviewed by Johnny
2010-03-16 17:58:06 +00:00
3bb628ff73
merge from viewer-2-0
2010-03-16 17:39:32 +00:00
f8caa38265
merge
2010-03-16 10:34:26 -07:00
27a7a68883
Fix for normal task (EXT-6355) [TRANSLATED BUT IN EN] - Inventory, hovertext of system folders: hovertext isn´t localized.
...
- Added updating tooltips with localized names.
Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/39/
--HG--
branch : product-engine
2010-03-16 19:22:17 +02:00
a5d1a7b1ba
merge
...
--HG--
branch : product-engine
2010-03-16 18:59:20 +02:00
9677026a03
Manual merge from default branch.
...
Resolved conflicts in:
* merging indra/newview/llpanelpick.cpp
* merging indra/newview/llviewermessage.cpp
* merging indra/newview/skins/default/xui/en/strings.xml
--HG--
branch : product-engine
2010-03-16 18:55:37 +02:00
b3f305ae94
Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).
...
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/
--HG--
branch : product-engine
2010-03-16 18:29:56 +02:00
a85497f598
Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
...
--HG--
branch : product-engine
2010-03-16 17:54:51 +02:00
b5ba328480
EXT-5904 “Offers embedding into IM windows”,
...
added restoring IM counters when logging message;
--HG--
branch : product-engine
2010-03-16 17:50:14 +02:00
ba52dc2fd1
fixed EXT-4820 [NUX] Viewer dimensions on first-run
...
changed first run window height from 768 to 738
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/38/
--HG--
branch : product-engine
2010-03-16 17:49:45 +02:00
220c0e9479
Fixed normal task EXT-6025 - [HARD CODED] Side Bar : "Save Pick" - "Pick" is in EN (Save [WHAT])
...
Removed unused hardcoded strings, replaced "Save [WHAT]" with simple "Save Pick" as it's the only label needed for this button.
Reviewer by Kent Quirk https://codereview.productengine.com/secondlife/r/28/
--HG--
branch : product-engine
2010-03-16 17:36:44 +02:00
628f24c491
Fixed normal task EXT-6282 - [TRANSLATED BUT IN EN]? - System message when receiving inventory offers: The item term needs to be localized
...
Localized asset type names will be taken from strings.xml.
Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/15/
--HG--
branch : product-engine
2010-03-16 17:34:50 +02:00
30c586e770
Updated normal task EXT-5905 - Resolving offers.
...
Update for TeleportOffered and OfferFriendship offers.
--HG--
branch : product-engine
2010-03-16 17:04:55 +02:00
d21980df98
fixed showstopper EXT-6289 (Clicking the plus button in the Places side panel only lets you add landmarks not folders)
...
- PLUS button works as GEAR button and PLUS button on inventory panel (show context menu on click)
- "Add a folder" menu item is always enabled (except for received folder)
- clicking "Add a folder" menu item creates a folder in My Landmarks tab no matter what has been selected in the Places panel before
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/10/
--HG--
branch : product-engine
2010-03-16 16:34:41 +02:00
ba414d500c
automated merge viewer2.0->viewe2.0
2010-03-16 10:19:37 -04:00
02f6a41723
merge
...
--HG--
branch : product-engine
2010-03-16 15:41:34 +02:00
163077bd98
EXT-6013 Normal [HARD CODED] - Group Invitation, Group Roles: The group roles need to be localized
...
reviwed https://codereview.productengine.com/secondlife/r/22/
--HG--
branch : product-engine
2010-03-16 15:36:06 +02:00
bda0e60f98
fix for normal EXT-6354 [HARD CODED] - Inventory, Filter-popup: Title isnґt localized
...
reviwed https://codereview.productengine.com/secondlife/r/35/
--HG--
branch : product-engine
2010-03-16 15:31:30 +02:00
97dea26dfc
Updated normal task EXT-5905 - Resolving offers.
...
Implemented requested feature - "Resolving offer in the notification toast shouldn't remove offer panel form IM log until IM session is restarted"
--HG--
branch : product-engine
2010-03-16 15:30:01 +02:00
7e6e69a1cc
merge
...
--HG--
branch : product-engine
2010-03-16 15:27:51 +02:00
13710336cb
EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs translation
...
Reviwed https://codereview.productengine.com/secondlife/r/13/
--HG--
branch : product-engine
2010-03-16 15:24:28 +02:00
3874823bd8
Merge from viewer-2-0
...
--HG--
branch : product-engine
2010-03-16 15:02:58 +02:00
a872814de9
fixed EXT-6322 [NAMELESS XUI STRING] Nearby Media> Detail window - "Nearby Media" "Show:" and "On other Avatars"
...
fixed "name" attributes
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/37/
--HG--
branch : product-engine
2010-03-16 14:51:56 +02:00
5675afccbb
fixed EXT-6363 [HARD CODED] "Login Failed." is hardcoded
...
moved out "Login failed." to strings.xml
Reviewed by Q at https://codereview.productengine.com/secondlife/r/27/
--HG--
branch : product-engine
2010-03-16 14:49:20 +02:00
2fed8d5182
fixed EXT-5904 “Offers embedding into IM windows”,
...
corrected offer counter(used silent adding message to session without
incrementing counter);
avoided assertion when received offer from blocked avatar with closed IM
session;
--HG--
branch : product-engine
2010-03-16 14:48:20 +02:00
04e692b3f1
Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several messages need to be localized).
...
Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/
--HG--
branch : product-engine
2010-03-16 14:45:12 +02:00
5bfb3d5c26
Implemented normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese.
...
Normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/32/
--HG--
branch : product-engine
2010-03-16 14:30:30 +02:00
Eli Linden