41c51a07eb
merge
2010-03-18 16:39:27 -07:00
0ff89dfe2a
EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit to Viewer Prefs
...
fixed radio item values so they work in true and false cases for UseExternalBrowser
reviewed by Callum
2010-03-18 16:39:14 -07:00
7f0739a1bf
VWR-17631 en_xui_change
2010-03-18 16:19:01 -07:00
b48ea0148c
EXT-5849 - [crashhunters] Crash in LLView::drawChildren()
...
attempted fix by removing gesture combo popup lists from floater view holder
reviewed by Leyla
2010-03-18 15:38:23 -07:00
63a0e89fb5
merge from hotfix to viewer-2-0 and resolve conflicts
2010-03-18 16:53:41 -04:00
2a68f7bd90
FR cycle8 translation for beta5
2010-03-18 13:47:43 -07:00
f1e9621287
linguistic
2010-03-18 13:38:35 -07:00
8c90061c7d
merge
2010-03-18 13:15:02 -07:00
8eeb11e258
EXT-6426 - Role titles with UTF-8 characters prevent login when enabled
...
reviewed by Monroe
2010-03-18 13:13:14 -07:00
af721d3f54
fixing linux build errors from bao's checkin for EXT-6093
...
viewer wouldn't compile under linux, due to gcc being paranoid about a few
things. Fixed them up and got them reviewed.
Code reviewed by bao.
2010-03-18 16:10:24 -04:00
978bf16797
Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).
...
- Removed unnecessary string in strings.xml and substituted it in code with existing one.
--HG--
branch : product-engine
2010-03-18 21:51:27 +02:00
ae371d0411
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-18 15:47:13 -04:00
a04cdf5af2
Merge
2010-03-18 12:40:11 -07:00
73802de5d5
CT-575 DA translation for beta 5 new file
2010-03-18 12:39:28 -07:00
95ef2e89ae
CT-575 DA translation for beta 5; JA linguistic
2010-03-18 12:39:19 -07:00
c5a6360943
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-18 15:26:31 -04:00
bffe4b185d
EXT-5851 EXT-5422 crash on texture upload
...
Uploading texture caused the dummy avatar preview to initialize its joints twice
removing extra call to initInstance removed the crash in LLJoint.
Verified repro no longer crashes viewer.
Code reviewed by Vir.
2010-03-18 15:26:17 -04:00
90cb98cc02
Implemented normal task EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs translation).
...
String is server side hardcoded!
- Moved strings to strings.xml
- Parsed incoming "You paid" messages in code via regex
--HG--
branch : product-engine
2010-03-18 21:15:43 +02:00
3e2db3d336
oops, type right before commit :(
2010-03-18 11:44:13 -07:00
615f2cb18e
EXT-6389 Fix for numbers in edit appearance not showing up on Mac.
2010-03-18 13:18:51 -05:00
37b188d929
merge
2010-03-18 11:07:05 -07:00
20e4960510
EXT-6347 - Crash when clicking on member's section of Oskar Linden Fanclub
...
reviewed by Callum
2010-03-18 11:06:48 -07:00
1944f64107
manual merge -r 10503
2010-03-18 20:06:32 +02:00
4abc086930
Merge
2010-03-18 10:57:42 -07:00
766a67249f
DE cycle8 translation for beta 5; FR linguistic
2010-03-18 10:56:51 -07:00
1bf989705c
fixed EXT-5630 “nearby chat flickers when top line fades out”,
...
used reverse order to provide correct z-order and avoid toast blinking caused
by z-reordering;
reviewed by Vadim at https://codereview.productengine.com/secondlife/r/57/
2010-03-18 19:56:24 +02:00
c74f870151
(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)
...
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml
Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/
--HG--
branch : product-engine
2010-03-18 19:42:38 +02:00
2f9223dc14
merge
...
--HG--
branch : product-engine
2010-03-18 19:22:30 +02:00
2b7a6f9325
set default viewer window size to 1024x738 EXT-4820 [NUX] Viewer dimensions on first-run
...
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/69/
--HG--
branch : product-engine
2010-03-18 18:55:06 +02:00
1900b5f410
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-18 10:31:12 -06:00
1550729348
Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after name is truncated when the name is long. need 'en' xui rework)
...
* Changed the way blocked items are shown in the list. For now they are separated on two columns: Name & Type.
If Name is too long it is shown truncated (with ...)
* As result remove deprecated methods from LLMute to concatenate its name & type and to extract name & type from the such concatenated string.
* reduce include dependence from llmutelist.h
--HG--
branch : product-engine
2010-03-18 18:13:39 +02:00
095cd1b639
fixed EXT-6092 [crashhunters] Crash in LLFlatListView::selectItemPair
...
turned off commit on focus lost for the filter editor (Panel Places) in the code
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/63/
--HG--
branch : product-engine
2010-03-18 17:45:35 +02:00
00c4dabc2b
Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in inventory.
...
Added new icon for multi-objects.
New icon is used in inventory, object inventory and buy floater.
New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply.
--HG--
branch : product-engine
2010-03-18 17:32:44 +02:00
40e7a65c69
merge
...
--HG--
branch : product-engine
2010-03-18 17:09:32 +02:00
646c349f41
merge
...
--HG--
branch : product-engine
2010-03-18 16:55:32 +02:00
4dd4aca705
working on EXT-5839 Creating a new wearable ...
...
some strings for localization
--HG--
branch : product-engine
2010-03-18 16:53:40 +02:00
33746d7c73
merge
...
--HG--
branch : product-engine
2010-03-18 16:43:11 +02:00
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
f318d93646
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:32 +02:00
beaeb85d8f
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:23 +02:00
1adbea341d
merge
...
--HG--
branch : product-engine
2010-03-18 16:37:41 +02:00
63375642c8
Backed out changeset 0305673fe81e EXT-4820 [NUX] Viewer dimensions on first-run
...
--HG--
branch : product-engine
2010-03-18 16:32:55 +02:00
c67bc96278
Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."
--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
51b69a33aa
Backed out changeset 03b83d14ed74 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "implemented LLWindowSDL::maximize() method"
--HG--
branch : product-engine
2010-03-18 16:30:06 +02:00
9229f09928
Backed out changeset a95c1f4dcf02 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "implemented LLWindowMacOSX::maximize() method"
--HG--
branch : product-engine
2010-03-18 16:28:54 +02:00
ec3443cc85
Backed out changeset 2624e0d8b6f4
...
--HG--
branch : product-engine
2010-03-18 16:27:34 +02:00
c86f61fd31
automated merge viewer2.0->viewer2.0
2010-03-18 10:19:18 -04:00
bca2d21df6
Updates for normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, profiles: the teleport button is truncated. need 'en' xui designer rework)
...
* 'en/panel_profile.xml' was redesigned. Assuming that 'de' locale doesn't have width overridden:
** added ellipses to buttons' labels to get possibility found truncation easier (except for IM button)
** reduced distance between buttons
** reduced padding from left/right sides to 1 px
But there are still issue in two locales:
'es' for "add friend"
'pt' for "teleport"
These buttons can not be shown properly with default widths.
Note: 'de' & 'fr' locales have overridden width (not removed in the patch)
--HG--
branch : product-engine
2010-03-18 16:10:16 +02:00
d856f1ea95
Low task (EXT-6261) [HARD CODED] Abuse Report: After sending an abuse report, there is a popup window stating that the report is sent/uploaded. The window isn´t localized.
...
- Removed hardcoded string.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/
--HG--
branch : product-engine
2010-03-18 15:44:31 +02:00
a3a4235a89
EXT-6321 -- clicking on an event in the main map now invokes the event details floater instead of trying to do a search for the event.
2010-03-18 09:22:34 -04:00
Richard Linden