From 683e7dc9c387297aed6b670fff1915af880562ae Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Thu, 28 Jan 2010 12:47:45 -0800 Subject: FIX EXT-4630 EXT-4670: Show inspector tooltip over media, don't show it if media is playing Review #91 This is a different take from my prior implementation. This has two changes to the "rules" for showing the inspector tooltip: 1. Do not show the inspector tooltip if hovering over a face that has media displaying 2. If you hover over a face with media *data* on it, show the inspector tooltip, subject to rule #1 (i.e. only if media is not displaying) --- indra/newview/lltoolpie.cpp | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 39e71974fd..bf1e307d71 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -910,16 +910,19 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l tooltip_msg.append( nodep->mName ); } + bool has_media = false; bool is_time_based_media = false; bool is_web_based_media = false; bool is_media_playing = false; + bool is_media_displaying = false; // Does this face have media? const LLTextureEntry* tep = hover_object->getTE(mHoverPick.mObjectFace); if(tep) { - const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL; + has_media = tep->hasMedia(); + const LLMediaEntry* mep = has_media ? tep->getMediaData() : NULL; if (mep) { viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()); @@ -927,33 +930,38 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (media_impl.notNull() && (media_impl->hasMedia())) { + is_media_displaying = true; LLStringUtil::format_map_t args; media_plugin = media_impl->getMediaPlugin(); if(media_plugin) - { if(media_plugin->pluginSupportsMediaTime()) - { - is_time_based_media = true; - is_web_based_media = false; - //args["[CurrentURL]"] = media_impl->getMediaURL(); - is_media_playing = media_impl->isMediaPlaying(); - } - else - { - is_time_based_media = false; - is_web_based_media = true; - //args["[CurrentURL]"] = media_plugin->getLocation(); - } + { + if(media_plugin->pluginSupportsMediaTime()) + { + is_time_based_media = true; + is_web_based_media = false; + //args["[CurrentURL]"] = media_impl->getMediaURL(); + is_media_playing = media_impl->isMediaPlaying(); + } + else + { + is_time_based_media = false; + is_web_based_media = true; + //args["[CurrentURL]"] = media_plugin->getLocation(); + } //tooltip_msg.append(LLTrans::getString("CurrentURL", args)); } } } } + // Avoid showing tip over media that's displaying // also check the primary node since sometimes it can have an action even though // the root node doesn't - bool needs_tip = needs_tooltip(nodep) || - needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()); + bool needs_tip = !is_media_displaying && + (has_media || + needs_tooltip(nodep) || + needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); if (show_all_object_tips || needs_tip) { -- cgit v1.2.3 From ec5dbb60e71302a77f68cc604e7dfd52bcaa926a Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 13:36:39 +0000 Subject: EXT-4763: Revert my previous fix. We don't want to universally disabled URL highlighting for all toast alerts, e.g., the report abuse notification has URLs that we want users to be able to click on. I have a better plan... --- indra/newview/lltoastalertpanel.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index da31bb3e73..c3ccb9380b 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -170,7 +170,6 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal params.tab_stop(false); params.wrap(true); params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP); - params.allow_html(false); LLTextBox * msg_box = LLUICtrlFactory::create (params); // Compute max allowable height for the dialog text, so we can allocate -- cgit v1.2.3 From 2ec69d6d71e18c60a81d55f79e291e366d05eacd Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 14:56:39 +0000 Subject: EXT-4678: Revert URL black list support from LLTextBase. The new URL provides a more flexible solution that can be specified in XUI (as we now do to disabled hyperlinking for the sim hostname in the About floater). --- indra/newview/llfloaterabout.cpp | 6 ------ indra/newview/skins/default/xui/en/floater_about.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 04f4ddf996..ef69f39ad2 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -187,12 +187,6 @@ BOOL LLFloaterAbout::postBuild() support << '\n' << getString("AboutTraffic", args); } - // don't make the sim hostname be a hyperlink - if (info.has("HOSTNAME")) - { - support_widget->addBlackListUrl(info["HOSTNAME"].asString()); - } - support_widget->appendText(support.str(), FALSE, LLStyle::Params() diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index b6443c4c21..bfdd48e2f4 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -21,7 +21,7 @@ Built with [COMPILER] version [COMPILER_VERSION] -You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP]) +You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] -- cgit v1.2.3 From 303c379a18630fbbc2c4a86714ebd9627c03ec9e Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 14:57:41 +0000 Subject: EXT-4763: Use syntax to disable linking of landmark names. --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fc535205f1..d3e08cad3a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3088,7 +3088,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport to [LOCATION]? +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? Date: Fri, 29 Jan 2010 17:34:44 +0000 Subject: EXT-4493: Mark snapshot as dirty when changing quality slider. --- indra/newview/llfloatersnapshot.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 94c7ff6f94..a0031f0193 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -378,6 +378,7 @@ void LLSnapshotLivePreview::setSnapshotQuality(S32 quality) { mSnapshotQuality = quality; gSavedSettings.setS32("SnapshotQuality", quality); + mSnapshotUpToDate = FALSE; } } -- cgit v1.2.3 From 1b5880a18ef82d79d8c60bcf2745baf80f3fa571 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 10:46:48 -0800 Subject: notifiaction_id -> notification_id ouch. --- indra/newview/llimfloater.cpp | 4 ++-- indra/newview/llnotificationhandlerutil.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index c2bcb1cdf9..9e52d4c6c2 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -604,9 +604,9 @@ void LLIMFloater::updateMessages() chat.mTimeStr = time; // process offer notification - if (msg.has("notifiaction_id")) + if (msg.has("notification_id")) { - chat.mNotifId = msg["notifiaction_id"].asUUID(); + chat.mNotifId = msg["notification_id"].asUUID(); } //process text message else diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index f9b3b7187a..16218f6d53 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -248,7 +248,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) llassert_always(session != NULL); LLSD offer; - offer["notifiaction_id"] = notification->getID(); + offer["notification_id"] = notification->getID(); offer["from_id"] = notification->getPayload()["from_id"]; offer["from"] = name; offer["time"] = LLLogChat::timestamp(true); -- cgit v1.2.3 From fab60b8c05a89498bd8efeafdea8acfa5f94f06c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 11:08:04 -0800 Subject: requred -> required --- indra/newview/llfavoritesbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 57e6619470..f5bb777419 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -780,8 +780,8 @@ LLButton* LLFavoritesBarCtrl::createButton(const LLPointergetWidth(item->getName()) + 20; - int width = requred_width > def_button_width? def_button_width : requred_width; + int required_width = mFont->getWidth(item->getName()) + 20; + int width = required_width > def_button_width? def_button_width : required_width; LLFavoriteLandmarkButton* fav_btn = NULL; // do we have a place for next button + double buttonHGap + mChevronButton ? -- cgit v1.2.3 From b3a0419493c9d3fcea4ca5ba89fdd311feccfec6 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:07:36 -0800 Subject: CID-350 Checker: UNINIT_CTOR Function: LLDrawPoolAvatar::LLDrawPoolAvatar() File: /indra/newview/lldrawpoolavatar.cpp not a bug, just a dead member... --- indra/newview/lldrawpoolavatar.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index 6a2b7fc218..b947943619 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -39,8 +39,6 @@ class LLVOAvatar; class LLDrawPoolAvatar : public LLFacePool { -protected: - S32 mNumFaces; public: enum { -- cgit v1.2.3 From 9c55d91f786eff48a27bf960e1f48f5369532e66 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:11:09 -0800 Subject: CID-349 Checker: UNINIT_CTOR Function: LLDrawPoolWater::LLDrawPoolWater() File: /indra/newview/lldrawpoolwater.cpp just another dead member. --- indra/newview/lldrawpoolwater.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 68a8172dd0..614f645243 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -47,7 +47,6 @@ protected: LLPointer mWaterImagep; LLPointer mWaterNormp; - const LLWaterSurface *mWaterSurface; public: static BOOL sSkipScreenCopy; static BOOL sNeedsReflectionUpdate; -- cgit v1.2.3 From d74aff7869d45f3061026766bfbd2db942645ac9 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:13:37 -0800 Subject: CID-347 Checker: UNINIT_CTOR Function: LLDrawPoolSky::LLDrawPoolSky() File: /indra/newview/lldrawpoolsky.cpp --- indra/newview/lldrawpoolsky.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 8428be194f..0f76165053 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -48,8 +48,11 @@ #include "pipeline.h" #include "llviewershadermgr.h" -LLDrawPoolSky::LLDrawPoolSky() : - LLFacePool(POOL_SKY), mShader(NULL) +LLDrawPoolSky::LLDrawPoolSky() +: LLFacePool(POOL_SKY), + + mSkyTex(NULL), + mShader(NULL) { } @@ -132,6 +135,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) return; } + llassert(mSkyTex); mSkyTex[side].bindTexture(TRUE); face.renderIndexed(); -- cgit v1.2.3 From b05ca33c4aa350d342dee6b03d1481fce0924a53 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:16:02 -0800 Subject: CID-346 Checker: UNINIT_CTOR Function: LLFeatureManager::LLFeatureManager() File: /indra/newview/llfeaturemanager.h --- indra/newview/llfeaturemanager.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 383963a41d..dd218d428f 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -99,8 +99,14 @@ protected: class LLFeatureManager : public LLFeatureList, public LLSingleton { public: - LLFeatureManager() : - LLFeatureList("default"), mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN) + LLFeatureManager() + : LLFeatureList("default"), + + mInited(FALSE), + mTableVersion(0), + mSafe(FALSE), + mGPUClass(GPU_CLASS_UNKNOWN), + mGPUSupported(FALSE) { } ~LLFeatureManager() {cleanupFeatureTables();} -- cgit v1.2.3 From d477b83325822989e0c4ad70fbee3797937215b7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:43:46 -0800 Subject: CID-328 Checker: UNINIT_CTOR Function: LLAgent::LLAgent() File: /indra/newview/tests/llviewerhelputil_test.cpp --- indra/newview/tests/llviewerhelputil_test.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index 297d98ad8d..dd61ac6ae5 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -87,8 +87,6 @@ public: __attribute__ ((noinline)) #endif BOOL isGodlike() const { return FALSE; } -private: - int dummy; }; LLAgent gAgent; -- cgit v1.2.3 From fd5af776d91cb102c49dcdfef24935bf8280349c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:00:29 -0800 Subject: CID-319 Checker: UNINIT_CTOR Function: LLViewerLogin::LLViewerLogin() File: /indra/newview/tests/lllogininstance_test.cpp --- indra/newview/tests/lllogininstance_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 7b28a3b72c..f7ac5361c5 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -56,9 +56,9 @@ void LLLogin::disconnect() //----------------------------------------------------------------------------- #include "../llviewernetwork.h" -unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'}; /* Flawfinder: ignore */ +unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'}; -LLViewerLogin::LLViewerLogin() {} +LLViewerLogin::LLViewerLogin() : mGridChoice(GRID_INFO_NONE) {} LLViewerLogin::~LLViewerLogin() {} void LLViewerLogin::getLoginURIs(std::vector& uris) const { -- cgit v1.2.3 From 1de15af932742f198595b914b33a0af1dcc49894 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 29 Jan 2010 16:34:05 -0800 Subject: Fix button size so it works for most/all target languages --- indra/newview/skins/default/xui/en/floater_about.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index bfdd48e2f4..bc67621dfd 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -91,7 +91,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number left="10" top_pad="5" height="25" - width="160" /> + width="180" /> Date: Fri, 29 Jan 2010 17:08:28 -0800 Subject: DEV-43688 Cycle3 for FR --- .../skins/default/xui/fr/floater_about_land.xml | 147 ++++++----- .../default/xui/fr/floater_animation_preview.xml | 5 +- .../default/xui/fr/floater_avatar_textures.xml | 62 ++--- .../skins/default/xui/fr/floater_bulk_perms.xml | 2 +- .../skins/default/xui/fr/floater_buy_currency.xml | 2 +- .../skins/default/xui/fr/floater_color_picker.xml | 2 +- .../skins/default/xui/fr/floater_customize.xml | 62 ++--- .../skins/default/xui/fr/floater_god_tools.xml | 12 +- .../skins/default/xui/fr/floater_im_container.xml | 2 +- .../skins/default/xui/fr/floater_incoming_call.xml | 6 + .../skins/default/xui/fr/floater_lsl_guide.xml | 2 +- .../skins/default/xui/fr/floater_media_browser.xml | 2 +- .../default/xui/fr/floater_outfit_save_as.xml | 11 + .../skins/default/xui/fr/floater_outgoing_call.xml | 9 + .../skins/default/xui/fr/floater_preferences.xml | 2 +- .../default/xui/fr/floater_preview_gesture.xml | 3 + .../default/xui/fr/floater_preview_notecard.xml | 2 +- .../default/xui/fr/floater_preview_texture.xml | 5 +- .../skins/default/xui/fr/floater_report_abuse.xml | 4 +- .../skins/default/xui/fr/floater_script_limits.xml | 2 + .../skins/default/xui/fr/floater_search.xml | 7 + .../skins/default/xui/fr/floater_select_key.xml | 6 +- .../skins/default/xui/fr/floater_sell_land.xml | 2 +- .../skins/default/xui/fr/floater_snapshot.xml | 20 +- .../skins/default/xui/fr/floater_sys_well.xml | 9 +- .../skins/default/xui/fr/floater_telehub.xml | 8 +- .../skins/default/xui/fr/floater_texture_ctrl.xml | 2 +- .../newview/skins/default/xui/fr/floater_tools.xml | 13 +- .../skins/default/xui/fr/floater_top_objects.xml | 69 ++--- .../default/xui/fr/floater_voice_controls.xml | 30 ++- .../default/xui/fr/floater_whitelist_entry.xml | 2 +- .../skins/default/xui/fr/floater_window_size.xml | 17 ++ .../skins/default/xui/fr/floater_world_map.xml | 150 ++++++----- .../skins/default/xui/fr/inspect_avatar.xml | 10 +- .../newview/skins/default/xui/fr/inspect_group.xml | 1 + .../skins/default/xui/fr/menu_attachment_other.xml | 17 ++ .../skins/default/xui/fr/menu_attachment_self.xml | 12 + .../skins/default/xui/fr/menu_avatar_icon.xml | 2 +- .../skins/default/xui/fr/menu_avatar_other.xml | 16 ++ .../skins/default/xui/fr/menu_avatar_self.xml | 27 ++ .../skins/default/xui/fr/menu_bottomtray.xml | 5 + .../skins/default/xui/fr/menu_im_well_button.xml | 4 + .../skins/default/xui/fr/menu_imchiclet_adhoc.xml | 4 + .../skins/default/xui/fr/menu_imchiclet_p2p.xml | 2 +- .../default/xui/fr/menu_inspect_avatar_gear.xml | 1 + .../skins/default/xui/fr/menu_inventory.xml | 8 +- .../default/xui/fr/menu_inventory_gear_default.xml | 2 + indra/newview/skins/default/xui/fr/menu_land.xml | 9 + indra/newview/skins/default/xui/fr/menu_login.xml | 6 +- .../xui/fr/menu_notification_well_button.xml | 4 + indra/newview/skins/default/xui/fr/menu_object.xml | 25 ++ .../skins/default/xui/fr/menu_participant_list.xml | 17 +- .../skins/default/xui/fr/menu_people_groups.xml | 8 + .../skins/default/xui/fr/menu_people_nearby.xml | 1 + .../skins/default/xui/fr/menu_profile_overflow.xml | 4 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 46 ++-- .../skins/default/xui/fr/mime_types_linux.xml | 217 ++++++++++++++++ .../skins/default/xui/fr/mime_types_mac.xml | 217 ++++++++++++++++ .../newview/skins/default/xui/fr/notifications.xml | 154 +++++------ .../default/xui/fr/panel_active_object_row.xml | 9 + .../default/xui/fr/panel_adhoc_control_panel.xml | 16 +- .../default/xui/fr/panel_avatar_list_item.xml | 1 + .../default/xui/fr/panel_block_list_sidetray.xml | 4 +- .../skins/default/xui/fr/panel_bottomtray.xml | 12 +- .../skins/default/xui/fr/panel_classified_info.xml | 4 +- .../skins/default/xui/fr/panel_edit_classified.xml | 4 +- .../skins/default/xui/fr/panel_edit_profile.xml | 5 +- .../newview/skins/default/xui/fr/panel_friends.xml | 10 +- .../default/xui/fr/panel_group_control_panel.xml | 20 +- .../skins/default/xui/fr/panel_group_general.xml | 8 +- .../default/xui/fr/panel_group_info_sidetray.xml | 2 + .../skins/default/xui/fr/panel_group_invite.xml | 6 +- .../skins/default/xui/fr/panel_group_list_item.xml | 1 + .../skins/default/xui/fr/panel_group_notices.xml | 14 +- .../skins/default/xui/fr/panel_group_notify.xml | 2 +- .../default/xui/fr/panel_im_control_panel.xml | 32 ++- .../skins/default/xui/fr/panel_landmark_info.xml | 1 + indra/newview/skins/default/xui/fr/panel_login.xml | 68 ++--- .../skins/default/xui/fr/panel_main_inventory.xml | 6 +- .../xui/fr/panel_media_settings_general.xml | 22 +- .../xui/fr/panel_media_settings_permissions.xml | 19 +- .../xui/fr/panel_media_settings_security.xml | 8 +- .../skins/default/xui/fr/panel_my_profile.xml | 80 +++--- .../skins/default/xui/fr/panel_navigation_bar.xml | 3 + indra/newview/skins/default/xui/fr/panel_notes.xml | 18 +- .../default/xui/fr/panel_outfits_inventory.xml | 15 +- .../fr/panel_outfits_inventory_gear_default.xml | 6 +- .../newview/skins/default/xui/fr/panel_people.xml | 1 + indra/newview/skins/default/xui/fr/panel_picks.xml | 12 +- .../skins/default/xui/fr/panel_place_profile.xml | 3 +- .../newview/skins/default/xui/fr/panel_places.xml | 7 +- .../default/xui/fr/panel_preferences_alerts.xml | 4 +- .../default/xui/fr/panel_preferences_chat.xml | 10 +- .../default/xui/fr/panel_preferences_general.xml | 26 +- .../default/xui/fr/panel_preferences_privacy.xml | 8 +- .../default/xui/fr/panel_preferences_setup.xml | 8 +- .../default/xui/fr/panel_preferences_sound.xml | 4 +- .../default/xui/fr/panel_prim_media_controls.xml | 52 +++- .../newview/skins/default/xui/fr/panel_profile.xml | 77 +++--- .../skins/default/xui/fr/panel_region_estate.xml | 10 +- .../skins/default/xui/fr/panel_region_general.xml | 6 +- .../default/xui/fr/panel_region_general_layout.xml | 43 +++ .../skins/default/xui/fr/panel_region_texture.xml | 3 +- .../xui/fr/panel_script_limits_my_avatar.xml | 13 + .../xui/fr/panel_script_limits_region_memory.xml | 24 ++ .../skins/default/xui/fr/panel_side_tray.xml | 11 +- .../skins/default/xui/fr/panel_status_bar.xml | 3 +- .../default/xui/fr/panel_teleport_history.xml | 4 +- .../default/xui/fr/panel_teleport_history_item.xml | 1 + .../newview/skins/default/xui/fr/role_actions.xml | 245 +++++------------- .../skins/default/xui/fr/sidepanel_appearance.xml | 8 +- .../skins/default/xui/fr/sidepanel_inventory.xml | 2 +- .../skins/default/xui/fr/sidepanel_item_info.xml | 57 ++-- .../skins/default/xui/fr/sidepanel_task_info.xml | 76 +++--- indra/newview/skins/default/xui/fr/strings.xml | 288 +++++++++++++++++++-- 115 files changed, 1912 insertions(+), 988 deletions(-) create mode 100644 indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_script_limits.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_window_size.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_attachment_other.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_attachment_self.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_avatar_other.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_avatar_self.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_im_well_button.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_land.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_object.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups.xml create mode 100644 indra/newview/skins/default/xui/fr/mime_types_linux.xml create mode 100644 indra/newview/skins/default/xui/fr/mime_types_mac.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_active_object_row.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_region_general_layout.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index cf595edab9..4c97551e55 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -13,7 +13,7 @@ restantes - + Nouveaux utilisateurs uniquement @@ -36,10 +36,10 @@ (propriété du groupe) - Profil... + Profil - Infos... + Infos (public) @@ -52,7 +52,6 @@ Aucune parcelle sélectionnée. -Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails. Nom : @@ -80,14 +79,15 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa Leyla Linden -