From cb7fbc8a2093fd1ed5440d0f3184d9080cecad48 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 18 Mar 2010 16:53:27 -0700 Subject: EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs" Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately Reviewed by Monroe --- indra/llplugin/llpluginclassmedia.cpp | 15 +++++ indra/llplugin/llpluginclassmedia.h | 2 + indra/media_plugins/webkit/media_plugin_webkit.cpp | 50 +++++++++++---- indra/newview/app_settings/settings.xml | 22 +++++++ indra/newview/llviewermedia.cpp | 13 ++++ .../default/xui/en/panel_preferences_privacy.xml | 9 --- .../default/xui/en/panel_preferences_setup.xml | 75 +++++++++++++++++----- install.xml | 4 +- 8 files changed, 150 insertions(+), 40 deletions(-) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index cb62e46271..bf0e19473e 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -696,6 +696,20 @@ void LLPluginClassMedia::setLanguageCode(const std::string &language_code) sendMessage(message); } +void LLPluginClassMedia::setPluginsEnabled(const bool enabled) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "plugins_enabled"); + message.setValueBoolean("enable", enabled); + sendMessage(message); +} + +void LLPluginClassMedia::setJavascriptEnabled(const bool enabled) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "javascript_enabled"); + message.setValueBoolean("enable", enabled); + sendMessage(message); +} + LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) { // convert a LinkTargetType value from llqtwebkit to an ETargetType @@ -1065,6 +1079,7 @@ void LLPluginClassMedia::clear_cookies() void LLPluginClassMedia::enable_cookies(bool enable) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "enable_cookies"); + message.setValueBoolean("enable", enable); sendMessage(message); } diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 6318c67f12..79356beb68 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -179,6 +179,8 @@ public: // These can be called before init(), and they will be queued and sent before the media init message. void setUserDataPath(const std::string &user_data_path); void setLanguageCode(const std::string &language_code); + void setPluginsEnabled(const bool enabled); + void setJavascriptEnabled(const bool enabled); /////////////////////////////////// // media browser class functions diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 24c53638d2..0462fce236 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -89,6 +89,9 @@ private: std::string mProfileDir; std::string mHostLanguage; + bool mCookiesEnabled; + bool mJavascriptEnabled; + bool mPluginsEnabled; enum { @@ -277,21 +280,18 @@ private: { LLQtWebKit::getInstance()->setHostLanguage(mHostLanguage); } + + // turn on/off cookies based on what host app tells us + LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled ); + + // turn on/off plugins based on what host app tells us + LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled ); + + // turn on/off Javascript based on what host app tells us + LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled ); // create single browser window mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight ); -#if LL_WINDOWS - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); -#elif LL_DARWIN - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); -#elif LL_LINUX - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); -#endif - // Enable cookies - LLQtWebKit::getInstance()->enableCookies( true ); // tell LLQtWebKit about the size of the browser window LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); @@ -671,6 +671,10 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_ mBackgroundR = 0.0f; mBackgroundG = 0.0f; mBackgroundB = 0.0f; + + mHostLanguage = "en"; // default to english + mJavascriptEnabled = true; // default to on + mPluginsEnabled = true; // default to on } MediaPluginWebKit::~MediaPluginWebKit() @@ -825,6 +829,14 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) // FIXME: Should we do anything with this if it comes in after the browser has been initialized? } + else if(message_name == "plugins_enabled") + { + mPluginsEnabled = message_in.getValueBoolean("enable"); + } + else if(message_name == "javascript_enabled") + { + mJavascriptEnabled = message_in.getValueBoolean("enable"); + } else if(message_name == "size_change") { std::string name = message_in.getValue("name"); @@ -1026,8 +1038,18 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) } else if(message_name == "enable_cookies") { - bool val = message_in.getValueBoolean("enable"); - LLQtWebKit::getInstance()->enableCookies( val ); + mCookiesEnabled = message_in.getValueBoolean("enable"); + LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled ); + } + else if(message_name == "enable_plugins") + { + mPluginsEnabled = message_in.getValueBoolean("enable"); + LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled ); + } + else if(message_name == "enable_javascript") + { + mJavascriptEnabled = message_in.getValueBoolean("enable"); + //LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled ); } else if(message_name == "proxy_setup") { diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8edf766132..f8d556bb80 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1563,6 +1563,28 @@ Value 1 + BrowserJavascriptEnabled + + Comment + Enable Javascript in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + + BrowserPluginsEnabled + + Comment + Enable Web plugins in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + CreateToolCopyCenters Comment diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index b9509a98f5..99bfad9b45 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1260,6 +1260,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ media_source->setSize(default_width, default_height); media_source->setUserDataPath(user_data_path); media_source->setLanguageCode(LLUI::getLanguage()); + + // collect 'cookies enabled' setting from prefs and send to embedded browser + bool cookies_enabled = gSavedSettings.getBOOL( "CookiesEnabled" ); + media_source->enable_cookies( cookies_enabled ); + + // collect 'plugins enabled' setting from prefs and send to embedded browser + bool plugins_enabled = gSavedSettings.getBOOL( "BrowserPluginsEnabled" ); + media_source->setPluginsEnabled( plugins_enabled ); + + // collect 'javascript enabled' setting from prefs and send to embedded browser + bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" ); + media_source->setJavascriptEnabled( javascript_enabled ); + if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) { return media_source; diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index f232a69482..3d7f392404 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -68,15 +68,6 @@ left="30" name="auto_disengage_mic_check" top_pad="10" - width="350" /> - - + + + + + + + Proxy location: @@ -335,7 +380,7 @@ increment="1" initial_value="80" label="Port number:" - label_width="75" + label_width="70" layout="topleft" left_delta="230" max_val="12000" diff --git a/install.xml b/install.xml index 7337241cf8..e8f0e5d318 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - ee5d242ea468ba9a82d2bf8581aa308d + 93b49cfea365fe082eda3e466a9beec3 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100312.tar.bz2 + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100318.tar.bz2 -- cgit v1.2.3 From 70df3c1fa72ae8ecddf144452b4fe032ad48182e Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 18 Mar 2010 16:59:29 -0700 Subject: EXT-6401 - Add feature to disable Javascript via prefs (updates Mac LLQtWebKit - via patch from Monroe) --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index e8f0e5d318..2b12c0566f 100644 --- a/install.xml +++ b/install.xml @@ -948,9 +948,9 @@ anguage Infrstructure (CLI) international standard darwin md5sum - 8321cbd098e6e791a02cb00ed3bcff6c + ada82d41467cdb7f8e25a442f58b6963 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100312.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100318.tar.bz2 linux -- cgit v1.2.3 From 6fc719813e4ef3a6c9a2950af331b978fbc9cd04 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 19 Mar 2010 11:15:46 -0400 Subject: EXT-6445 After copying an item, changes to new item affect old item Since multiple inventory items can refer to the same asset ID, we needed to revert changes to old_wearable (indexed by asset ID) after saving changes made to a wearable to a new asset ID. This prevents user confusion around unsaved changes. Code reviewed by vir. --- indra/newview/llagentwearables.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 65503d4998..ebadd8a165 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -443,6 +443,11 @@ void LLAgentWearables::saveWearable(const EWearableType type, const U32 index, B new_wearable->setItemID(old_item_id); // should this be in LLWearable::copyDataFrom()? setWearable(type,index,new_wearable); + // old_wearable may still be referred to by other inventory items. Revert + // unsaved changes so other inventory items aren't affected by the changes + // that were just saved. + old_wearable->revertValues(); + LLInventoryItem* item = gInventory.getItem(old_item_id); if (item) { @@ -545,6 +550,11 @@ void LLAgentWearables::saveWearableAs(const EWearableType type, category_id, new_name, cb); + + // old_wearable may still be referred to by other inventory items. Revert + // unsaved changes so other inventory items aren't affected by the changes + // that were just saved. + old_wearable->revertValues(); } void LLAgentWearables::revertWearable(const EWearableType type, const U32 index) -- cgit v1.2.3 From b84b0e71c12bb5ae7e9a6dafa1735a99f5975645 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 19 Mar 2010 11:23:51 -0400 Subject: For EXT-4173, EXT-5871, EXT-3812: increased timeout for wearable asset fetches from 20 seconds to 60 seconds. Reviewed by Nyx --- indra/newview/llappearancemgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index f2d15757c9..b3dfb8f141 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -399,7 +399,7 @@ bool LLWearableHoldingPattern::isFetchCompleted() bool LLWearableHoldingPattern::isTimedOut() { - static F32 max_wait_time = 20.0; // give up if wearable fetches haven't completed in max_wait_time seconds. + static F32 max_wait_time = 60.0; // give up if wearable fetches haven't completed in max_wait_time seconds. return mWaitTime.getElapsedTimeF32() > max_wait_time; } -- cgit v1.2.3 From 2a3c30dc7ce2be59f168f8c02d0e86e2ae916959 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 19 Mar 2010 11:48:00 -0400 Subject: EXT-6479 : Inspect Object floater doesn't update highlight and selection EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Very simple fix that addresses some brokenness with the inspect multi-object floater. Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out. --- indra/newview/llselectmgr.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index d733574a9d..c4ca4a65f8 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4936,17 +4936,18 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) if (mSelectedObjects->getNumNodes()) { LLUUID inspect_item_id= LLUUID::null; -#if 0 LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); if(inspect_instance) { inspect_item_id = inspect_instance->getSelectedUUID(); } -#endif - LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); - if (panel_task_info) + else { - inspect_item_id = panel_task_info->getSelectedUUID(); + LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); + if (panel_task_info) + { + inspect_item_id = panel_task_info->getSelectedUUID(); + } } LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getFocusedObjectID(); @@ -5534,13 +5535,12 @@ void dialog_refresh_all() LLFloaterProperties::dirtyAll(); -#if 0 LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); if(inspect_instance) { inspect_instance->dirty(); } -#endif + LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); if (panel_task_info) { -- cgit v1.2.3 From f50be64167c254e27f635ad47d8940551f0c6ab4 Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Fri, 19 Mar 2010 12:09:06 -0500 Subject: EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent() added null guard to fix crash when the xform has no parent. reviewed by davep. --- indra/newview/llviewerobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5642d07a5..6c8346df86 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4029,7 +4029,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const avatar_parent = (LLViewerObject*)root_edit->getParent(); } - if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) + if (avatar_parent && avatar_parent->isAvatar() && + root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); -- cgit v1.2.3 From b952a5e5851d1a8bc2a45f00248b051497fec71f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 19 Mar 2010 13:21:39 -0400 Subject: EXT-6479 : Inspect Object floater doesn't update highlight and selection EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Simple fix to only use Inspect floater if it's actually active (i.e. visible). --- indra/newview/llselectmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c4ca4a65f8..9147bd1cba 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4937,7 +4937,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) { LLUUID inspect_item_id= LLUUID::null; LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); - if(inspect_instance) + if(inspect_instance && inspect_instance->getVisible()) { inspect_item_id = inspect_instance->getSelectedUUID(); } -- cgit v1.2.3 From 107e076c83caf1d0163f5a0a3c0d3ee0b8ed1e56 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 19 Mar 2010 17:40:39 +0000 Subject: EXT-6486 Update Vivox SDK to 3.1.0001.8181 New Vivox SDK release to fix three main crash issues discovered through automatic crash reporting to Vivox enabled in Beta 4, along with extra diagnostics to help track down the cause of SLVoice failing to exit. --- install.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.xml b/install.xml index 7337241cf8..51aa199282 100644 --- a/install.xml +++ b/install.xml @@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard darwin md5sum - bce6f58d3d63bda049bb7059583ed8e8 + 38d836fa53d073b9f197eecd0f5615f0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-darwin-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-darwin-20100319.tar.bz2 linux md5sum - 12aac7288af3565ac2730796cb6d8de6 + dd8dd1c223ecb8b232bf626cca6c63ac url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-linux-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-linux-20100319.tar.bz2 windows md5sum - 8af04ae8c536e8db80f67e6e5305fb61 + 8b4ce60f25823cd38896cb3b7eb0dd43 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-windows-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-windows-20100319.tar.bz2 -- cgit v1.2.3 From 8cd1f7d1e158632ef5d7f01b685105647e42b56f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 19 Mar 2010 11:11:42 -0700 Subject: FR linguistic; CT-575 IT set7 translation for beta 5 --- .../default/xui/fr/floater_day_cycle_options.xml | 2 +- .../skins/default/xui/fr/mime_types_linux.xml | 2 +- .../skins/default/xui/fr/mime_types_mac.xml | 2 +- .../default/xui/fr/panel_prim_media_controls.xml | 2 +- .../newview/skins/default/xui/it/floater_about.xml | 16 +- .../skins/default/xui/it/floater_about_land.xml | 22 +- .../default/xui/it/floater_animation_preview.xml | 3 + .../default/xui/it/floater_avatar_textures.xml | 55 +-- .../skins/default/xui/it/floater_bulk_perms.xml | 2 +- .../skins/default/xui/it/floater_buy_currency.xml | 2 +- .../skins/default/xui/it/floater_buy_land.xml | 258 ++++++------- .../skins/default/xui/it/floater_color_picker.xml | 2 +- .../skins/default/xui/it/floater_customize.xml | 108 +++--- .../skins/default/xui/it/floater_help_browser.xml | 7 +- indra/newview/skins/default/xui/it/floater_im.xml | 2 +- .../skins/default/xui/it/floater_im_container.xml | 2 +- .../skins/default/xui/it/floater_incoming_call.xml | 6 + .../skins/default/xui/it/floater_inventory.xml | 8 +- .../default/xui/it/floater_live_lsleditor.xml | 2 +- .../skins/default/xui/it/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/it/floater_map.xml | 2 +- .../skins/default/xui/it/floater_media_browser.xml | 8 +- .../skins/default/xui/it/floater_moveview.xml | 4 +- .../skins/default/xui/it/floater_outgoing_call.xml | 12 + .../skins/default/xui/it/floater_pay_object.xml | 2 +- .../skins/default/xui/it/floater_preferences.xml | 2 +- .../default/xui/it/floater_preview_animation.xml | 2 +- .../default/xui/it/floater_preview_gesture.xml | 3 + .../default/xui/it/floater_preview_notecard.xml | 6 +- .../skins/default/xui/it/floater_preview_sound.xml | 2 +- .../default/xui/it/floater_preview_texture.xml | 7 +- .../skins/default/xui/it/floater_report_abuse.xml | 4 +- .../default/xui/it/floater_script_preview.xml | 2 +- .../skins/default/xui/it/floater_select_key.xml | 2 +- .../default/xui/it/floater_settings_debug.xml | 8 +- .../skins/default/xui/it/floater_snapshot.xml | 21 +- .../skins/default/xui/it/floater_sys_well.xml | 2 +- .../skins/default/xui/it/floater_texture_ctrl.xml | 2 +- .../skins/default/xui/it/floater_top_objects.xml | 69 ++-- .../default/xui/it/floater_voice_controls.xml | 17 +- .../default/xui/it/floater_wearable_save_as.xml | 2 +- .../default/xui/it/floater_whitelist_entry.xml | 2 +- .../skins/default/xui/it/floater_world_map.xml | 69 +--- .../skins/default/xui/it/inspect_avatar.xml | 2 +- .../skins/default/xui/it/menu_avatar_self.xml | 8 +- .../default/xui/it/menu_inspect_avatar_gear.xml | 2 + .../skins/default/xui/it/menu_inventory.xml | 11 +- .../skins/default/xui/it/menu_inventory_add.xml | 2 +- indra/newview/skins/default/xui/it/menu_login.xml | 2 +- indra/newview/skins/default/xui/it/menu_object.xml | 12 +- .../skins/default/xui/it/menu_participant_list.xml | 18 +- .../skins/default/xui/it/menu_people_nearby.xml | 3 + .../xui/it/menu_people_nearby_multiselect.xml | 1 + .../skins/default/xui/it/menu_profile_overflow.xml | 6 + indra/newview/skins/default/xui/it/menu_viewer.xml | 80 ++-- .../newview/skins/default/xui/it/notifications.xml | 191 +++++----- .../default/xui/it/panel_adhoc_control_panel.xml | 16 +- .../default/xui/it/panel_avatar_list_item.xml | 1 + .../default/xui/it/panel_block_list_sidetray.xml | 6 +- .../skins/default/xui/it/panel_bottomtray.xml | 17 +- .../skins/default/xui/it/panel_classified_info.xml | 17 +- .../skins/default/xui/it/panel_edit_profile.xml | 5 +- .../newview/skins/default/xui/it/panel_friends.xml | 2 +- .../default/xui/it/panel_group_control_panel.xml | 20 +- .../skins/default/xui/it/panel_group_general.xml | 24 +- .../default/xui/it/panel_group_info_sidetray.xml | 43 ++- .../skins/default/xui/it/panel_group_invite.xml | 10 +- .../default/xui/it/panel_group_land_money.xml | 106 +++--- .../skins/default/xui/it/panel_group_list_item.xml | 1 + .../skins/default/xui/it/panel_group_notices.xml | 4 +- .../skins/default/xui/it/panel_group_notify.xml | 2 +- .../skins/default/xui/it/panel_group_roles.xml | 4 +- .../default/xui/it/panel_im_control_panel.xml | 36 +- .../skins/default/xui/it/panel_landmark_info.xml | 1 + .../skins/default/xui/it/panel_landmarks.xml | 2 +- indra/newview/skins/default/xui/it/panel_login.xml | 34 +- .../skins/default/xui/it/panel_main_inventory.xml | 2 +- indra/newview/skins/default/xui/it/panel_me.xml | 4 +- .../xui/it/panel_media_settings_security.xml | 6 +- .../skins/default/xui/it/panel_my_profile.xml | 58 ++- .../skins/default/xui/it/panel_navigation_bar.xml | 9 +- indra/newview/skins/default/xui/it/panel_notes.xml | 2 +- .../default/xui/it/panel_outfits_inventory.xml | 17 +- .../it/panel_outfits_inventory_gear_default.xml | 4 +- .../newview/skins/default/xui/it/panel_people.xml | 18 +- .../skins/default/xui/it/panel_place_profile.xml | 57 +-- .../newview/skins/default/xui/it/panel_places.xml | 11 +- .../default/xui/it/panel_preferences_advanced.xml | 41 +- .../default/xui/it/panel_preferences_alerts.xml | 6 +- .../default/xui/it/panel_preferences_chat.xml | 12 +- .../default/xui/it/panel_preferences_general.xml | 19 +- .../default/xui/it/panel_preferences_graphics1.xml | 4 +- .../default/xui/it/panel_preferences_privacy.xml | 7 +- .../default/xui/it/panel_preferences_setup.xml | 22 +- .../default/xui/it/panel_preferences_sound.xml | 17 +- .../default/xui/it/panel_prim_media_controls.xml | 61 ++- .../newview/skins/default/xui/it/panel_profile.xml | 64 ++-- .../skins/default/xui/it/panel_region_covenant.xml | 2 +- .../skins/default/xui/it/panel_region_estate.xml | 9 +- .../skins/default/xui/it/panel_region_texture.xml | 4 +- .../skins/default/xui/it/panel_side_tray.xml | 23 +- .../skins/default/xui/it/panel_status_bar.xml | 6 +- .../default/xui/it/panel_teleport_history.xml | 4 + .../skins/default/xui/it/sidepanel_appearance.xml | 11 +- .../skins/default/xui/it/sidepanel_item_info.xml | 55 +-- .../skins/default/xui/it/sidepanel_task_info.xml | 97 ++--- indra/newview/skins/default/xui/it/strings.xml | 418 +++++++++++---------- 107 files changed, 1283 insertions(+), 1231 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml index 15cc6cd1ba..951670ec7e 100644 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml @@ -84,7 +84,7 @@ Prévisualiser : -