5ad91abfdf
Backed out changeset b447707f20f5
2010-06-15 14:49:16 +01:00
11e6e208d4
Adding error handling to share to web feature.
...
Reviewed by Callum
2010-03-17 14:21:58 -07:00
b5b5aa7353
Fixes EXT-1659; disable cancel button once server reports teleport finished.
2010-03-16 16:19:33 -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
41ed9b3bcb
New snapshot/social media floater
...
reviewed by Richard
2010-03-16 11:00:36 -07:00
3bb628ff73
merge from viewer-2-0
2010-03-16 17:39:32 +00: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
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
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
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
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
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
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
28b1264c57
Fixed critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk button is truncated "Sprechen". need xui designer to widen it by some 10 pixels
...
* restored Speak button shrink feature
* redesigned Speak button to accommodate label in 'de' locale
** made it wider to 5 px
** made label left-aligned
** set left padding to 12px
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/36/
--HG--
branch : product-engine
2010-03-16 14:28:47 +02:00
9bdf262d85
Merge
2010-03-15 18:31:45 -07:00
43f1abee2b
EXT-6367: Can't delete non-links from COF
...
EXT-6372 : Can waer non-links in COF
Some minor changes to account for non-link items appearing in the COF (non-links shouldn't appear in COF, but this can happen due to bugs or 1.23 usage).
First fix allows for these items to be deleted.
Second fix ignores these items from being processed/worn.
2010-03-15 17:43:17 -04:00
73ebb9efc9
ES linguistic; PT adding 4 missing strings from set4
2010-03-15 11:41:41 -07:00
00f2785682
EXT-6010 apperance reverts to an old outfit while attempting to wear new outfit
...
Removing log spam before pushing to main branch. change is de minimis. -Nyx
2010-03-15 14:11:25 -04:00
8fa640cfe2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-15 12:09:09 -04:00
8112ba5baf
EXT-6010 Appearance reverts to an old outfit while attempting to wear new outfit
...
Added code to suppress local composite updates while wearables are loaded. This
makes sure that we don't update your appearance until all your wearables are
added to gAgentWearables. Hackish for 2.0, but will be inherently better for 2.1
code reviewed by vir.
2010-03-15 12:08:57 -04:00
f41274cae3
Merge from default branch
...
--HG--
branch : product-engine
2010-03-15 17:43:38 +02:00
b6e11798ac
merge from viewer-2-0
2010-03-15 15:38:24 +00:00
42d1aaee2e
PE merge.
2010-03-15 15:23:28 +00:00
8a8e8e46ee
merge
...
--HG--
branch : product-engine
2010-03-15 13:35:20 +02:00
ea6af38e40
Fixed normal bug (EXT-5834) Inventory SP: context menu for empty search result contain inappropriate items.
...
- Fixed folder_view and inventory_panel resizing in LLFolderView::arrange() when all visible items are filtered out. This fixed context menu for "Search" SLURL in Places->My Landmarks.
- Added check for visible items to display correct context menu when right-clicking on "Search" SLURL for empty search results in any inventory panel.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/14/
--HG--
branch : product-engine
2010-03-15 12:51:57 +02:00
bc1f01c948
fix for EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs translation
...
--HG--
branch : product-engine
2010-03-15 12:04:30 +02:00
641757e7c1
Fixed normal task EXT-6018 - [TRANSLATED BUT IN EN] "Save" button on notecard
...
Removed deprecated string to resolve duplicated names(string.save and button.save).
Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/12/
--HG--
branch : product-engine
2010-03-15 10:35:09 +02:00
a58551c050
Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit Pick - "(will update after save)"
...
Replaced hardcoded string with xml string.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/8/
--HG--
branch : product-engine
2010-03-15 10:32:51 +02:00
272772b867
Fixed normal task EXT-6260 - [NAMELESS STRING] - Menu Preferences, Tab Chat: Show IMs in: and (requires restart) need to be localized (panel_preferences_chat.xml)
...
Added widget missing names to make localization tool work.
Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/7/
--HG--
branch : product-engine
2010-03-15 10:30:54 +02:00
234cd6e7c0
Fix-up of doc/contributions.txt (missed another one!), no functional changes
2010-03-13 20:04:54 +00:00
d44485b106
Fix-up of doc/contributions.txt, no functional changes
2010-03-13 19:48:22 +00:00
da62a52b8d
ES missing strings from set4-6; linguistic
2010-03-12 16:58:12 -08:00
8c33d5aecc
Merge
2010-03-12 16:12:34 -08:00
69efa833f7
linguistic
2010-03-12 16:11:29 -08:00
c1fc387b58
EXT-2180 final linguistic edits of set1 and set6b by Novella
2010-03-12 16:08:46 -08:00
d5e685306c
(for B5) Fix for EXT-5823 "Include language in user-agent string" (implemented via JavaScript - not in ua string)
...
(for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry"
Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
2010-03-12 14:34:25 -08:00
6079a50186
New linux build of llqtwebkit.
...
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-12 13:49:40 -08:00
bf767cc648
New mac build of llqtwebkit.
...
Built from revision da5938d041a1 of hg.lindenlab.com/monroe/llqtwebkit-4.6/
and commit 976cb208e4c1ae9df62bce979a5148d7b89172c5 of http://gitorious.org/+lindenqt/qt/lindenqt
2010-03-12 13:46:35 -08:00
a212f0cb3a
EXT-5983 manual fix for changed EN root element name= (VLT bug; didn't flag change before)
2010-03-12 13:44:16 -08:00
Tofu Linden