From 92ddf3e7c040ceac81b5e5a38eedd03d1f913440 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 7 Nov 2019 22:38:18 +0100 Subject: [PATCH 001/172] Transplant SL-11913 Favorites not resetting properly --- indra/newview/fspanellogin.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index 63c2b4bd9b..ea9aa5943d 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -373,6 +373,10 @@ void FSPanelLogin::addFavoritesToStartLocation() } break; } + if (combo->getValue().asString().empty()) + { + combo->selectFirstItem(); + } LLFloaterPreference::updateShowFavoritesCheckbox(mShowFavorites); } @@ -1117,13 +1121,13 @@ void FSPanelLogin::onSelectServer() { std::string location = location_combo->getValue().asString(); LLSLURL slurl(location); // generata a slurl from the location combo contents - if ( slurl.getType() == LLSLURL::LOCATION - && slurl.getGrid() != LLGridManager::getInstance()->getGrid() - ) + if (location.empty() + || (slurl.getType() == LLSLURL::LOCATION + && slurl.getGrid() != LLGridManager::getInstance()->getGrid()) + ) { // the grid specified by the location is not this one, so clear the combo location_combo->setCurrentByIndex(0); // last location on the new grid - location_combo->setTextEntry(LLStringUtil::null); } } break; From 26375a9daa0943e7fc5350a2be74cf001ce63ccc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Nov 2019 14:22:28 +0100 Subject: [PATCH 002/172] When doing click-to-walk, only focus camera on agent if walk is actually going to be performed --- indra/newview/lltoolpie.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 5a97d82953..177c03bd44 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -620,7 +620,8 @@ bool LLToolPie::walkToClickedLocation() mPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * SELF_CLICK_WALK_DISTANCE; } - gAgentCamera.setFocusOnAvatar(TRUE, TRUE); + // Only focus camera if we're actually doing something! + //gAgentCamera.setFocusOnAvatar(TRUE, TRUE); if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) || (mPick.mObjectID.notNull() && !mPick.mPosGlobal.isExactlyZero())) @@ -633,6 +634,9 @@ bool LLToolPie::walkToClickedLocation() return false; } // [/RLVa:KB] + // Only focus camera if we're actually doing something! + gAgentCamera.setFocusOnAvatar(TRUE, TRUE); + if (mAutoPilotDestination) { mAutoPilotDestination->markDead(); } mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE); mAutoPilotDestination->setPositionGlobal(mPick.mPosGlobal); From 303d018fceb0e77f94fafe2054c78787370fe1e4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Nov 2019 14:35:50 +0100 Subject: [PATCH 003/172] Add key bindings to settings backup --- .../skins/default/xui/en/panel_preferences_backup.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml index d30ef8bb1e..f83ca06150 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml @@ -166,6 +166,11 @@ Settings groups to be restored (backup will always save all): Favorites stored_favorites.xml + + + Controls + key_bindings.xml + From 414f7efb8724282017c3327bcf9390574efe69a4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Nov 2019 15:33:52 +0100 Subject: [PATCH 004/172] Fix user key bindings not properly displayed after re-opening preferences --- indra/newview/llkeyconflict.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index b4f5ec4d57..121965a388 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -124,6 +124,10 @@ EMouseClickType mouse_from_string(const std::string& input) { return CLICK_BUTTON5; } + if (input == "Double LMB") + { + return CLICK_DOUBLELEFT; + } return CLICK_NONE; } @@ -396,7 +400,7 @@ void LLKeyConflictHandler::loadFromSettings(ESourceMode load_mode) // load user's filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_default); - if (!gDirUtilp->fileExists(filename) || loadFromSettings(load_mode, filename, &mControlsMap)) + if (!gDirUtilp->fileExists(filename) || !loadFromSettings(load_mode, filename, &mControlsMap)) { // mind placeholders mControlsMap.insert(mDefaultsMap.begin(), mDefaultsMap.end()); From 5424cfe7eaf88c51a62a9a7d6d5f8c08fd4692b4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Nov 2019 18:13:34 +0100 Subject: [PATCH 005/172] Update German translation --- .../default/xui/de/floater_preferences.xml | 1 + .../default/xui/de/floater_select_key.xml | 25 ++++++++++++++++--- .../skins/default/xui/de/notifications.xml | 6 +++++ .../xui/de/panel_preferences_backup.xml | 4 +-- .../default/xui/de/panel_preferences_move.xml | 15 ----------- .../xui/de/panel_preferences_sound.xml | 6 +---- .../default/xui/en/floater_select_key.xml | 12 ++++----- .../skins/default/xui/en/notifications.xml | 4 ++- .../xui/en/panel_preferences_controls.xml | 4 +-- .../xui/de/floater_preferences.xml | 1 + 10 files changed, 43 insertions(+), 35 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index 7765814df1..322a19e023 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml @@ -20,6 +20,7 @@ https://accounts.secondlife.com/change_email/?lang=de-DE + diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml index fd71844122..a3d5ca238d 100644 --- a/indra/newview/skins/default/xui/de/floater_select_key.xml +++ b/indra/newview/skins/default/xui/de/floater_select_key.xml @@ -1,7 +1,24 @@ - - Date: Thu, 5 Dec 2019 21:44:43 +0200 Subject: [PATCH 066/172] SL-12269 Unknown asset types are matched in inventory search for specific types --- indra/newview/llinventoryfilter.cpp | 79 +++++++++++++++++++---------- 1 file changed, 53 insertions(+), 26 deletions(-) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index e8bc915f22..e200b5bc9e 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -286,21 +286,34 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent // Pass if this item's type is of the correct filter type if (filterTypes & FILTERTYPE_OBJECT) { - - // If it has no type, pass it, unless it's a link. - if (object_type == LLInventoryType::IT_NONE) - { - if (object && object->getIsLinkType()) - { - return FALSE; - } - } - else if ((1LL << object_type & mFilterOps.mFilterObjectTypes) == U64(0)) - { - return FALSE; - } + switch (object_type) + { + case LLInventoryType::IT_NONE: + // If it has no type, pass it, unless it's a link. + if (object && object->getIsLinkType()) + { + return FALSE; + } + break; + case LLInventoryType::IT_UNKNOWN: + { + // Unknows are only shown when we show every type. + // Unknows are 255 and won't fit in 64 bits. + if (mFilterOps.mFilterObjectTypes != 0xffffffffffffffffULL) + { + return FALSE; + } + break; + } + default: + if ((1LL << object_type & mFilterOps.mFilterObjectTypes) == U64(0)) + { + return FALSE; + } + break; + } } - + if(filterTypes & FILTERTYPE_WORN) { if (!get_is_item_worn(object_id)) @@ -411,18 +424,32 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLInventoryItem* item) cons // Pass if this item's type is of the correct filter type if (filterTypes & FILTERTYPE_OBJECT) { - // If it has no type, pass it, unless it's a link. - if (object_type == LLInventoryType::IT_NONE) - { - if (item && item->getIsLinkType()) - { - return false; - } - } - else if ((1LL << object_type & mFilterOps.mFilterObjectTypes) == U64(0)) - { - return false; - } + switch (object_type) + { + case LLInventoryType::IT_NONE: + // If it has no type, pass it, unless it's a link. + if (item && item->getIsLinkType()) + { + return FALSE; + } + break; + case LLInventoryType::IT_UNKNOWN: + { + // Unknows are only shown when we show every type. + // Unknows are 255 and won't fit in 64 bits. + if (mFilterOps.mFilterObjectTypes != 0xffffffffffffffffULL) + { + return FALSE; + } + break; + } + default: + if ((1LL << object_type & mFilterOps.mFilterObjectTypes) == U64(0)) + { + return FALSE; + } + break; + } } //////////////////////////////////////////////////////////////////////////////// From 57050ea2a712814c61e07558f9bf7f486b020bee Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 6 Dec 2019 17:39:00 +0200 Subject: [PATCH 067/172] SL-12198 Log source of quit command --- indra/newview/llappviewer.cpp | 1 + indra/newview/llappviewerlistener.cpp | 2 ++ indra/newview/llprogressview.cpp | 1 + indra/newview/llstartup.cpp | 2 ++ indra/newview/llviewerwindow.cpp | 1 + 5 files changed, 7 insertions(+) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8c56ed3cd1..2ddae0cfc2 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3994,6 +3994,7 @@ static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_q void LLAppViewer::userQuit() { + LL_INFOS() << "User requested quit" << LL_ENDL; if (gDisconnected || !gViewerWindow || !gViewerWindow->getProgressView() diff --git a/indra/newview/llappviewerlistener.cpp b/indra/newview/llappviewerlistener.cpp index 94250f1fc2..2380a8ebf0 100644 --- a/indra/newview/llappviewerlistener.cpp +++ b/indra/newview/llappviewerlistener.cpp @@ -52,10 +52,12 @@ LLAppViewerListener::LLAppViewerListener(const LLAppViewerGetter& getter): void LLAppViewerListener::requestQuit(const LLSD& event) { + LL_INFOS() << "Listener requested quit" << LL_ENDL; mAppViewerGetter()->requestQuit(); } void LLAppViewerListener::forceQuit(const LLSD& event) { + LL_INFOS() << "Listener requested force quit" << LL_ENDL; mAppViewerGetter()->forceQuit(); } diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index c17b86783d..8997456782 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -325,6 +325,7 @@ void LLProgressView::onCancelButtonClicked(void*) // cancel is pressed while teleporting inside region (EXT-4911) if (LLStartUp::getStartupState() < STATE_STARTED) { + LL_INFOS() << "User requesting quit during login" << LL_ENDL; LLAppViewer::instance()->requestQuit(); } else diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b1bdaa1c1a..150777a778 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1112,6 +1112,8 @@ bool idle_startup() // Its either downloading or declined. // If optional was skipped this case shouldn't // be reached. + + LL_INFOS() << "Forcing a quit due to update." << LL_ENDL; LLLoginInstance::getInstance()->disconnect(); LLAppViewer::instance()->forceQuit(); } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 6f468270d2..68313d9fce 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1378,6 +1378,7 @@ BOOL LLViewerWindow::handleCloseRequest(LLWindow *window) void LLViewerWindow::handleQuit(LLWindow *window) { + LL_INFOS() << "Window forced quit" << LL_ENDL; LLAppViewer::instance()->forceQuit(); } From fa650fe7913603249dd4a17c6c53ee1c254446ae Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 11 Dec 2019 14:09:22 +0200 Subject: [PATCH 068/172] SL-11891 Change format to SLT to make things consistent --- indra/newview/skins/default/xui/en/floater_about_land.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/en/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index a143adfa06..4a9aebbf09 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -123,8 +123,8 @@ No parcel selected. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] + - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] From 8c09a295c1e2a7d6ab0ce066d5d8a399fcfaea20 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 10 Dec 2019 20:44:49 +0200 Subject: [PATCH 069/172] SL-12435 Fix for some crashes in LLOutfitGallery --- indra/newview/llpaneloutfitsinventory.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index 8019335f97..8fff52ca4e 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -55,6 +55,7 @@ LLPanelOutfitsInventory::LLPanelOutfitsInventory() : mMyOutfitsPanel(NULL), mCurrentOutfitPanel(NULL), mActivePanel(NULL), + mAppearanceTabs(NULL), mInitialized(false) { gAgentWearables.addLoadedCallback(boost::bind(&LLPanelOutfitsInventory::onWearablesLoaded, this)); @@ -312,6 +313,7 @@ void LLPanelOutfitsInventory::initTabPanels() void LLPanelOutfitsInventory::onTabChange() { + if (!mAppearanceTabs) return; mActivePanel = dynamic_cast(mAppearanceTabs->getCurrentPanel()); if (!mActivePanel) return; From 79bc739115010dd26f6d82b6974e03a7ccd485d5 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 12 Dec 2019 17:45:58 +0200 Subject: [PATCH 070/172] SL-12416 Don't escape ad-hoc name in conversation.log --- indra/newview/llconversationlog.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index ba6b251d58..08a72a7838 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -478,6 +478,10 @@ bool LLConversationLog::saveToFile(const std::string& filename) conv_it->getSessionID().toString(conversation_id); conv_it->getParticipantID().toString(participant_id); + bool is_adhoc = (conv_it->getConversationType() == LLIMModel::LLIMSession::ADHOC_SESSION); + std::string conv_name = is_adhoc ? conv_it->getConversationName() : LLURI::escape(conv_it->getConversationName()); + std::string file_name = is_adhoc ? conv_it->getHistoryFileName() : LLURI::escape(conv_it->getHistoryFileName()); + // examples of two file entries // [1343221177] 0 1 0 John Doe| 7e4ec5be-783f-49f5-71dz-16c58c64c145 4ec62a74-c246-0d25-2af6-846beac2aa55 john.doe| // [1343222639] 2 0 0 Ad-hoc Conference| c3g67c89-c479-4c97-b21d-32869bcfe8rc 68f1c33e-4135-3e3e-a897-8c9b23115c09 Ad-hoc Conference hash597394a0-9982-766d-27b8-c75560213b9a| @@ -486,10 +490,10 @@ bool LLConversationLog::saveToFile(const std::string& filename) (S32)conv_it->getConversationType(), (S32)0, (S32)conv_it->hasOfflineMessages(), - LLURI::escape(conv_it->getConversationName()).c_str(), + conv_name.c_str(), participant_id.c_str(), conversation_id.c_str(), - LLURI::escape(conv_it->getHistoryFileName()).c_str()); + file_name.c_str()); } fclose(fp); return true; @@ -537,14 +541,18 @@ bool LLConversationLog::loadFromFile(const std::string& filename) conv_id_buffer, history_file_name); + bool is_adhoc = ((SessionType)stype == LLIMModel::LLIMSession::ADHOC_SESSION); + std::string conv_name = is_adhoc ? conv_name_buffer : LLURI::unescape(conv_name_buffer); + std::string file_name = is_adhoc ? history_file_name : LLURI::unescape(history_file_name); + ConversationParams params; params.time(LLUnits::Seconds::fromValue(time)) .conversation_type((SessionType)stype) .has_offline_ims(has_offline_ims) - .conversation_name(LLURI::unescape(conv_name_buffer)) + .conversation_name(conv_name) .participant_id(LLUUID(part_id_buffer)) .session_id(LLUUID(conv_id_buffer)) - .history_filename(LLURI::unescape(history_file_name)); + .history_filename(file_name); LLConversation conversation(params); From 6b3f51986836a86a281104b3cba30aebf36f87ce Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 14 Dec 2019 10:46:40 +0100 Subject: [PATCH 071/172] Apply changes for SL-11891 (Change format to SLT to make things consistent) to all languages --- indra/newview/skins/default/xui/da/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/da/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/da/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/da/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/de/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/de/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/de/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/de/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/es/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/es/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/es/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/es/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/fr/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/fr/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/fr/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/fr/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/it/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/it/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/it/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/it/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/ja/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/ja/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/ja/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/ja/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/pt/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/pt/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/pt/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/pt/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/ru/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/ru/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/ru/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/tr/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/tr/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/tr/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/tr/sidepanel_item_info.xml | 2 +- indra/newview/skins/default/xui/zh/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/zh/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/zh/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/zh/sidepanel_item_info.xml | 2 +- indra/newview/skins/latency/xui/de/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/de/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/es/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/fr/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/it/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/ja/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/pt/floater_about_land.xml | 2 +- indra/newview/skins/vintage/xui/tr/floater_about_land.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index cc24914bd9..f2ab43d242 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -64,7 +64,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel for at se detaljer. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Navn: diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml index d0dca8863a..30a9e173d3 100644 --- a/indra/newview/skins/default/xui/da/floater_inspect.xml +++ b/indra/newview/skins/default/xui/da/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml index c75acb610a..17e1080cb3 100644 --- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml @@ -16,7 +16,7 @@ Information om dette sted er ikke tilgængelig på grund af begrænsning i rettigheder. Check venligst dine adgangsrettigheder med ejeren af parcellen. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index d52845160b..522aafef2c 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -13,7 +13,7 @@ Ejer kan: - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] (Beholdning) diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index e4c798a5cc..53b7a87be7 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -72,7 +72,7 @@ Keine Parzelle ausgewählt. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Parzellen-ID konnte nicht ermittelt werden. diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml index d93fe2d26d..f8058a1a24 100644 --- a/indra/newview/skins/default/xui/de/floater_inspect.xml +++ b/indra/newview/skins/default/xui/de/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [day,datetime,local]. [mth,datetime,local] [year,datetime,local], [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt]. [mth,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] (Gruppe) diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml index 016088ccf5..7ed349cabb 100644 --- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml @@ -16,7 +16,7 @@ Die Informationen über diesen Standort sind zugriffsbeschränkt. Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Traffic: [TRAFFIC] Gebiet: [AREA] m² diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml index b4ba82a603..0f8e893445 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Eigentümer kann: - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] (Inventar) diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 636969e8fc..139caf9e72 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -72,7 +72,7 @@ No se ha seleccionado una parcela. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] No se ha podido resolver la id. de la parcela. diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml index d95653ddd0..a41a7cc564 100644 --- a/indra/newview/skins/default/xui/es/floater_inspect.xml +++ b/indra/newview/skins/default/xui/es/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt][day,datetime,slt] [mth,datetime,slt] [year,datetime,slt][hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml index 7cae47aeda..dd7d01825b 100644 --- a/indra/newview/skins/default/xui/es/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/es/panel_landmark_info.xml @@ -16,7 +16,7 @@ Por restricciones en el acceso, los datos de esta localización no están disponibles. Por favor, revisa tus permisos con el propietario de la parcela. - [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt][day,datetime,slt] [mth,datetime,slt] [year,datetime,slt][hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml index 0734e9c417..3c8f30ee66 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml @@ -19,7 +19,7 @@ El propietario puede: - [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt][day,datetime,slt] [mth,datetime,slt] [year,datetime,slt][hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] (Inventario) 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 fb65e71ee1..8a3655e5c5 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -72,7 +72,7 @@ Aucune parcelle sélectionnée. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] Nom : diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml index e07621b94a..a915e1d946 100644 --- a/indra/newview/skins/default/xui/fr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml @@ -1,6 +1,6 @@ - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local], + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt], (Groupe) diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml index ff2411a08e..639d0678d7 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml @@ -9,7 +9,7 @@ Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur. Aucune information sur ce lieu n'est disponible actuellement, veuillez réessayer ultérieurement. Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos droits avec le propriétaire du terrain. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] Trafic : [TRAFFIC] Surface : [AREA] m² diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml index caeb1f8589..ffb4524c83 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Le propriétaire peut : - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] (inventaire) diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index 057b11594f..ad80a0d44f 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -60,7 +60,7 @@ Nessun appezzamento selezionato. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] Impossibile trovare l'UUID del lotto. diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml index 1bd0104991..821f7de663 100644 --- a/indra/newview/skins/default/xui/it/floater_inspect.xml +++ b/indra/newview/skins/default/xui/it/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local], [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] (Gruppo) diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml index 9716ee168e..8e956bfa49 100644 --- a/indra/newview/skins/default/xui/it/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/it/panel_landmark_info.xml @@ -15,7 +15,7 @@ Informazioni su questo luogo non disponibili a causa delle limitazioni di accesso. Controlla i tuoi permessi con il proprietario del terreno. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] Traffico: [TRAFFIC] Area: [AREA] m² diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml index d2f19fa083..fa9b895507 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Il proprietario può: - [wkday,datetime,local] [day,datetime,local]/[mth,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt]/[mth,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] (Inventario) diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index bf519aa933..4a58f8f470 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -72,7 +72,7 @@ 区画が選択されていません。 - [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] 名前： diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml index d7cb612e2c..726592b129 100644 --- a/indra/newview/skins/default/xui/ja/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml @@ -1,7 +1,7 @@ - [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] 全体の東経: diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml index 2c5f26b2ad..c449f35289 100644 --- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml @@ -16,7 +16,7 @@ この位置の情報は、アクセス制限のためご利用いただけません。 許可については区画所有者にお問い合わせください。 - [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml index 9ca1afb8f0..f815790fc1 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml @@ -19,7 +19,7 @@ 所有者ができること： - [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] （インベントリ） diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 2a9075ea3a..2e57c7b3fc 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -73,7 +73,7 @@ Vá para o menu Mundo > Sobre o terreno ou selecione outro lote para mostrar os detalhes. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Nome: diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml index 6a00b1a628..8aa7521d25 100644 --- a/indra/newview/skins/default/xui/pt/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml index a5eb1b4ea2..56c7667b40 100644 --- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml @@ -16,7 +16,7 @@ Os dados deste lugar não estão indisponíveis devido a restrições de acesso. Verifique as permissões com o proprietário do terreno ou parcela. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml index 9afcb67d3d..fdf72fa5c8 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Proprietário pode: - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] (Inventário) diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml index 85b2af938a..45449659ed 100644 --- a/indra/newview/skins/default/xui/ru/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ru/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml index b91dd4036f..3929a130cc 100644 --- a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml @@ -16,7 +16,7 @@ Информация об этом месте недоступна, поскольку у вас нет прав на ее просмотр. Узнайте о своих правах, связавшись с владельцем участка. - [wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml index 79a645f536..8c3e28c12d 100644 --- a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Владелец может: - [wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] (инвентарь) diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml index 0e5512e384..05b1647d3c 100644 --- a/indra/newview/skins/default/xui/tr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml @@ -72,7 +72,7 @@ Seçili parsel yok. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Ad: diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml index 09130a31f3..a85fae6d0f 100644 --- a/indra/newview/skins/default/xui/tr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/tr/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml index 5c80b0ed65..0d176ae728 100644 --- a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml @@ -16,7 +16,7 @@ Erişim kısıtlamaları nedeniyle bu konum hakkında bilgiye erişilemiyor. Lütfen parsel sahibi nezdinde izinlerinizi kontrol edin. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml index 9c1b6a8dfd..133b5690a3 100644 --- a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml @@ -19,7 +19,7 @@ Sahip şunu yapabilir: - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] (Envanter) diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml index b9a1a9bdce..77bc279b40 100644 --- a/indra/newview/skins/default/xui/zh/floater_about_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml @@ -72,7 +72,7 @@ 未選擇地段。 - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] 名稱： diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml index 4e1f4b24fd..3bc093a25f 100644 --- a/indra/newview/skins/default/xui/zh/floater_inspect.xml +++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml @@ -1,7 +1,7 @@ - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml index a99b635eec..e31242f60b 100644 --- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml @@ -16,7 +16,7 @@ 權限不足，無法取得此位置的資訊。 請向地段所有人查詢你的權限。 - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml index 61c52066d0..9772dc1224 100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml @@ -19,7 +19,7 @@ 所有人可以： - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] （收納區） diff --git a/indra/newview/skins/latency/xui/de/floater_about_land.xml b/indra/newview/skins/latency/xui/de/floater_about_land.xml index 6b14cc67b8..231a5b4824 100644 --- a/indra/newview/skins/latency/xui/de/floater_about_land.xml +++ b/indra/newview/skins/latency/xui/de/floater_about_land.xml @@ -72,7 +72,7 @@ Keine Parzelle ausgewählt. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Parzellen-ID konnte nicht ermittelt werden. diff --git a/indra/newview/skins/vintage/xui/de/floater_about_land.xml b/indra/newview/skins/vintage/xui/de/floater_about_land.xml index 6b14cc67b8..231a5b4824 100644 --- a/indra/newview/skins/vintage/xui/de/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/de/floater_about_land.xml @@ -72,7 +72,7 @@ Keine Parzelle ausgewählt. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Parzellen-ID konnte nicht ermittelt werden. diff --git a/indra/newview/skins/vintage/xui/es/floater_about_land.xml b/indra/newview/skins/vintage/xui/es/floater_about_land.xml index 3c9b41abba..9c6a799e28 100644 --- a/indra/newview/skins/vintage/xui/es/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/es/floater_about_land.xml @@ -55,7 +55,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver sus características. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] No se ha podido resolver la id. de la parcela. diff --git a/indra/newview/skins/vintage/xui/fr/floater_about_land.xml b/indra/newview/skins/vintage/xui/fr/floater_about_land.xml index 13dd9288af..4869d85092 100644 --- a/indra/newview/skins/vintage/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/fr/floater_about_land.xml @@ -63,7 +63,7 @@ Aucune parcelle sélectionnée. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] Nom : diff --git a/indra/newview/skins/vintage/xui/it/floater_about_land.xml b/indra/newview/skins/vintage/xui/it/floater_about_land.xml index 14682175cf..9e3fc64bbb 100644 --- a/indra/newview/skins/vintage/xui/it/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/it/floater_about_land.xml @@ -64,7 +64,7 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezzamento per vederne i dettagli. - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [day,datetime,slt] [mth,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Nome: diff --git a/indra/newview/skins/vintage/xui/ja/floater_about_land.xml b/indra/newview/skins/vintage/xui/ja/floater_about_land.xml index 3bcebc94c5..e4914bc782 100644 --- a/indra/newview/skins/vintage/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/ja/floater_about_land.xml @@ -63,7 +63,7 @@ 区画が選択されていません。 - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] 該当の区画IDがありませんでした。 diff --git a/indra/newview/skins/vintage/xui/pt/floater_about_land.xml b/indra/newview/skins/vintage/xui/pt/floater_about_land.xml index e862868cf4..4a2bdd3ee6 100644 --- a/indra/newview/skins/vintage/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/pt/floater_about_land.xml @@ -64,7 +64,7 @@ Vá para o menu Mundo > Sobre o terreno ou selecione outro lote para mostrar os detalhes. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Nome: diff --git a/indra/newview/skins/vintage/xui/tr/floater_about_land.xml b/indra/newview/skins/vintage/xui/tr/floater_about_land.xml index 1a07a1de02..32f6a4a658 100644 --- a/indra/newview/skins/vintage/xui/tr/floater_about_land.xml +++ b/indra/newview/skins/vintage/xui/tr/floater_about_land.xml @@ -63,7 +63,7 @@ Seçili parsel yok. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] Ad: From e83da3f5e2f23443682ba26fa5f250cabe105ced Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 16 Dec 2019 14:36:33 +0200 Subject: [PATCH 072/172] SL-12453 FIXED The "Align planar faces" checkbox is visible in the Default mapping mode --- indra/newview/llpanelface.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index c686aab821..7b5ece7e7a 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1109,6 +1109,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) bool enabled = (editable && isIdenticalPlanarTexgen()); childSetValue("checkbox planar align", align_planar && enabled); + childSetVisible("checkbox planar align", enabled); childSetEnabled("checkbox planar align", enabled); childSetEnabled("button align textures", enabled && LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1); From 7633285f9a8a2908e596df3316d025c0fb64a73e Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 18 Dec 2019 17:36:05 +0200 Subject: [PATCH 073/172] SL-11921 fixed location overlaps --- indra/newview/skins/default/xui/pt/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/ru/floater_about_land.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 96e54bb9bc..0e7d0798c7 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -366,7 +366,7 @@ Apenas lotes maiores podem ser listados na busca. Avatares em outros lotes podem ver e conversar com avatares neste lote - + Ponto de Aterrissagem: [LANDING] +