e57cba8dcf
merge.
2010-03-04 17:24:34 +00:00
7498504c92
EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
...
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
def35926db
ext-4657 changed inappropriate llerrs to llwarns
...
reviewed by Lynx
2010-03-04 16:14:01 +00:00
496e6e1948
Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.
...
Disabled for now.
2010-03-04 14:30:57 +00:00
6a66b820bd
merge
2010-03-04 11:18:41 +00:00
0778175f80
Backed out changeset 3ed4974eb9ca
...
was: EXT - 5891 (Login location defaults to My Home)
backing this out because, although it sucks, it's per-spec :/
2010-03-04 11:18:32 +00:00
c4987fde9f
More PE merge (revert some of these to trunk versions - PE shouldn't be changing the translated files I reckon)
2010-03-04 10:52:44 +00:00
87c986dc58
PE merge.
2010-03-04 10:51:49 +00:00
6d5442fbbd
Fixed windows build.
...
--HG--
branch : product-engine
2010-03-04 09:22:55 +02:00
3614dc0073
Potential fix for EXT-5850 (Crash in LLPluginClassMedia::idle)
...
We don't actually have a repro for this bug, just a number of crash reports.
This potential fix makes an iterator loop safer in the face of the iterator changing during the loop. See the jira for further details.
Reviewed by Richard at http://codereview.lindenlab.com/331008
2010-03-03 17:13:14 -08:00
2b5ea03a40
CT-575 PT xlation, new files
2010-03-03 16:07:47 -08:00
38193d4f76
CT-575 PT xlation
2010-03-03 16:07:36 -08:00
458895a75d
VWR-17363 undoing old local overrides in FR XUI XML!
2010-03-03 15:09:05 -08:00
e47d107e2f
Merge
2010-03-03 12:10:00 -08:00
eabcd8e1b7
Fixed bug EXT-5687 (Classifieds are missing the clickthrough data).
...
We now take into account stats received from the so-called "new table" (for regions supporting "SearchStatRequest" capability).
--HG--
branch : product-engine
2010-03-03 22:07:39 +02:00
ece36d5df8
linguistic fixes for 2.0 beta 4
2010-03-03 12:07:00 -08:00
2ecc98cb2f
EXT-4963 Change all mentions of user to "Resident" and "Residents"
2010-03-03 13:54:48 -05:00
a9c6fbda50
EXT-4981 Building Grid is red; former white color is easier to see
2010-03-03 13:40:13 -05:00
22e6db5e51
EXT-4116 Bad label positions on REGION/ESTATE / Ground Textures
2010-03-03 13:13:32 -05:00
dfe98202c0
WIP on EXT-5687 (Classifieds are missing the clickthrough data).
...
Added clicks info and creation date.
--HG--
branch : product-engine
2010-03-03 20:10:27 +02:00
8516ed1dac
WIP on EXT-5687 (Classifieds are missing the clickthrough data).
...
Made the classified info panel layout more compact to add more widgets.
--HG--
branch : product-engine
2010-03-03 19:49:58 +02:00
e84e440adc
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-03-03 19:50:08 +02:00
41c3b459f2
fixed EXT-5685 “Duplicated 'user online/offline' toasts after coming back to
...
Viewer”,
implemented filtering of exclusive notifications;
--HG--
branch : product-engine
2010-03-03 19:48:16 +02:00
194a8d45b5
Changed fix for normal bug EXT-5838 (Creating a new wearable in a localized viewer appends localized wearable name with English word "New")
...
to make string more flexible- now position of item name may be changed in xml.
- Now string for localizations is "NewWearable" in strings.xml.
--HG--
branch : product-engine
2010-03-03 19:00:41 +02:00
9a02fe0a26
Fixed major sub-tusk EXT - 5826 ([TRANSLATION NOT SHOWN] floater_world_map.xml)
...
--HG--
branch : product-engine
2010-03-03 18:43:00 +02:00
4827906e34
Fixed major bug (EXT-5755) [TRANSLATION NOT SHOWN] sidepanel_task_info.xml
...
- Fixed name attribute for panels in which localization was broken.
--HG--
branch : product-engine
2010-03-03 18:32:21 +02:00
40cfa43d1a
EXT-4013 : Functionality loss: Inspect object
...
Cosmetic button XUI cleanup for inspect object floater: fattened buttons to correspond with typical viewer2 button styling.
2010-03-03 11:15:13 -05:00
8e37dd516a
automated merge viewer2.0->viewer2.0
2010-03-03 11:07:52 -05:00
f6b58f10e7
Updated major sub task EXT-5857 - location, content type, category, description in the Classified Info panel have no labels.
...
Changed paddings in classified info.
--HG--
branch : product-engine
2010-03-03 18:07:10 +02:00
0ac63ffbb1
EXT-4013 : Functionality loss: Inspect object
...
Detail button implemented as instructed; this brings up the old 1.23 multi-inspect floater.
2010-03-03 11:03:46 -05:00
ec0d5d93db
Fixed Linux build.
...
--HG--
branch : product-engine
2010-03-03 17:38:32 +02:00
e0abec0012
fixed EXT-5887 [NAMELESS STRING] - Menu Einstellungen, Tab Chat: Font size and Font Colors need translation ) (panel_preferences_chat.xml)
...
--HG--
branch : product-engine
2010-03-03 17:25:43 +02:00
a46be2b78c
Additional commit for Low Bug EXT-5752. Removing superfluous call of updateButtons()
...
--HG--
branch : product-engine
2010-03-03 17:17:43 +02:00
f53f121eb0
EXT-5863 Enabling Admin mode allows "Dump baked avatar textures" to work. No matter what you are wearing.
2010-03-03 15:04:59 +00:00
63678f96ad
Fixed normal bug EXT-5838 (Creating a new wearable in a localized viewer appends localized wearable name with English word "New")
...
- Moved hardcoded string to string "New" in strings.xml.
--HG--
branch : product-engine
2010-03-03 16:56:29 +02:00
dbdf02cc0d
Additional commit for EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
...
Fixed tooltip for agent SLURLs.
--HG--
branch : product-engine
2010-03-03 16:42:05 +02:00
f75f19be93
Fixed bug EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
...
For wiki-style links ([<URL> <label>]) we now show the tooltip corresponding to the URL type.
--HG--
branch : product-engine
2010-03-03 16:40:38 +02:00
76587bc1d6
Fixed major bugs: EXT-5889, EXT-5895, EXT-5896.
...
(EXT-5889) [TRANSLATED BUT IN EN] Side Bar : Place Profile > "Estate" (panel_place_profile.xml)
(EXT-5895) [TRANSLATED BUT IN EN] Side Bar : "About Land" and "Region/Estate" buttons inside "Place Profile "
(EXT-5896) [TRANSLATED BUT IN EN] Side Bar : Place Profile > "Region" panel_place_profile.xml
- Added names for panels which broke localization of widgets inside them.
--HG--
branch : product-engine
2010-03-03 16:41:05 +02:00
7b5ef7053f
Implemented major sub task EXT-5858 - Assigned picture is stretched in the Classified Info panel.
...
Reshape snapshot control to max possible size maintaining aspect ratio.
--HG--
branch : product-engine
2010-03-03 16:22:51 +02:00
c01c2ec86f
Fixed major sub-task EXT-5931 ( [XUI ATTRIBUTE NOT TRANSLATABLE] People > My Groups displays English string when no groups added)
...
- implemented workaround: added <strings> name="no_filtered_groups_msg" & name="no_groups_msg" in panel_people.xml
- also updated value for no_filtered_groups_msg. It was "Try fine...", seems should be "Try finding..."
--HG--
branch : product-engine
2010-03-03 16:24:25 +02:00
66128f6784
merge
...
--HG--
branch : product-engine
2010-03-03 16:16:25 +02:00
a6e2be71c5
fix for major EXT-5839 Creating a new wearable in a localized viewer attempts to use non-ascii characters for inventory types in some languages
...
--HG--
branch : product-engine
2010-03-03 16:14:52 +02:00
207fd2bfdd
merge
...
--HG--
branch : product-engine
2010-03-03 16:13:43 +02:00
9fde8c853f
Merge from default branch.
...
This reverts Angela's fixes to panel_classified_info. I'll fix that a bit
later.
--HG--
branch : product-engine
2010-03-03 16:07:44 +02:00
bba42a074a
Fixed major bug EXT - 5891 (Login location defaults to My Home)
...
--HG--
branch : product-engine
2010-03-03 15:07:14 +02:00
b5df36f81f
Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be localized. hard coded in llviewermessage.cpp).
...
- It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml
and used it in LLFloaterPreference::cleanupBadSetting().
--HG--
branch : product-engine
2010-03-03 15:02:04 +02:00
36a428c020
fixed EXT-5902 [TRANSLATED BUT IN EN] - In the IM window "Pay" needs translation (panel_im_control_panel.xml)
...
--HG--
branch : product-engine
2010-03-03 14:48:34 +02:00
9623625036
PE merge.
2010-03-03 11:41:35 +00:00
f7ecfe6dc4
merge.
2010-03-03 11:37:41 +00:00
8821755bd4
Backed out changeset 5f3d047f0b18
...
I'll never understand named branches, I guess.
2010-03-03 11:37:26 +00:00
Tofu Linden