From bb718155bddfbe7007029a0c9e69a4a98615f14d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 Jan 2023 18:06:45 -0500 Subject: DRTVWR-575: Replace some LLSDArray() usage with llsd::array(). It seems newer compilers have a different interpretation of exactly when to engage LLSDArray's copy constructor. In particular, this assignment: some_LLSD_map[key] = LLSDArray(...)(...)...; used to convert the LLSDArray object directly to LLSD; now it first calls the custom copy constructor, which embeds the intended array within an outer array before assigning it into the containing map. The newer llsd::array() function avoids that problem because what it returns is already an LLSD object. Taking inventory of LLSDArray assignments of that form turned up a number of workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is both simpler and more readable. Tip of the hat to Chorazinallen for surfacing this issue! --- indra/newview/llappviewer.cpp | 15 ++++++++------- indra/newview/llsettingsvo.cpp | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 23 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4f3e0b08e4..b31447a72b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3195,15 +3195,16 @@ LLSD LLAppViewer::getViewerInfo() const // LLFloaterAbout. LLSD info; auto& versionInfo(LLVersionInfo::instance()); - info["VIEWER_VERSION"] = LLSDArray(versionInfo.getMajor())(versionInfo.getMinor())(versionInfo.getPatch())(versionInfo.getBuild()); + info["VIEWER_VERSION"] = llsd::array(versionInfo.getMajor(), versionInfo.getMinor(), + versionInfo.getPatch(), versionInfo.getBuild()); info["VIEWER_VERSION_STR"] = versionInfo.getVersion(); info["CHANNEL"] = versionInfo.getChannel(); - info["ADDRESS_SIZE"] = ADDRESS_SIZE; - std::string build_config = versionInfo.getBuildConfig(); - if (build_config != "Release") - { - info["BUILD_CONFIG"] = build_config; - } + info["ADDRESS_SIZE"] = ADDRESS_SIZE; + std::string build_config = versionInfo.getBuildConfig(); + if (build_config != "Release") + { + info["BUILD_CONFIG"] = build_config; + } // return a URL to the release notes for this viewer, such as: // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 7c762170a7..1930faa1a0 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -568,11 +568,11 @@ void LLSettingsVOSky::convertAtmosphericsToLegacy(LLSD& legacy, LLSD& settings) legacy[SETTING_BLUE_DENSITY] = ensure_array_4(legacyhaze[SETTING_BLUE_DENSITY], 1.0); legacy[SETTING_BLUE_HORIZON] = ensure_array_4(legacyhaze[SETTING_BLUE_HORIZON], 1.0); - legacy[SETTING_DENSITY_MULTIPLIER] = LLSDArray(legacyhaze[SETTING_DENSITY_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); - legacy[SETTING_DISTANCE_MULTIPLIER] = LLSDArray(legacyhaze[SETTING_DISTANCE_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); + legacy[SETTING_DENSITY_MULTIPLIER] = llsd::array(legacyhaze[SETTING_DENSITY_MULTIPLIER].asReal(), 0.0f, 0.0f, 1.0f); + legacy[SETTING_DISTANCE_MULTIPLIER] = llsd::array(legacyhaze[SETTING_DISTANCE_MULTIPLIER].asReal(), 0.0f, 0.0f, 1.0f); - legacy[SETTING_HAZE_DENSITY] = LLSDArray(legacyhaze[SETTING_HAZE_DENSITY])(0.0f)(0.0f)(1.0f); - legacy[SETTING_HAZE_HORIZON] = LLSDArray(legacyhaze[SETTING_HAZE_HORIZON])(0.0f)(0.0f)(1.0f); + legacy[SETTING_HAZE_DENSITY] = llsd::array(legacyhaze[SETTING_HAZE_DENSITY], 0.0f, 0.0f, 1.0f); + legacy[SETTING_HAZE_HORIZON] = llsd::array(legacyhaze[SETTING_HAZE_HORIZON], 0.0f, 0.0f, 1.0f); } } @@ -586,15 +586,15 @@ LLSD LLSettingsVOSky::convertToLegacy(const LLSettingsSky::ptr_t &psky, bool isA legacy[SETTING_CLOUD_COLOR] = ensure_array_4(settings[SETTING_CLOUD_COLOR], 1.0); legacy[SETTING_CLOUD_POS_DENSITY1] = ensure_array_4(settings[SETTING_CLOUD_POS_DENSITY1], 1.0); legacy[SETTING_CLOUD_POS_DENSITY2] = ensure_array_4(settings[SETTING_CLOUD_POS_DENSITY2], 1.0); - legacy[SETTING_CLOUD_SCALE] = LLSDArray(settings[SETTING_CLOUD_SCALE])(LLSD::Real(0.0))(LLSD::Real(0.0))(LLSD::Real(1.0)); + legacy[SETTING_CLOUD_SCALE] = llsd::array(settings[SETTING_CLOUD_SCALE], LLSD::Real(0.0), LLSD::Real(0.0), LLSD::Real(1.0)); legacy[SETTING_CLOUD_SCROLL_RATE] = settings[SETTING_CLOUD_SCROLL_RATE]; - legacy[SETTING_LEGACY_ENABLE_CLOUD_SCROLL] = LLSDArray(LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][0].asReal()))) - (LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][1].asReal()))); - legacy[SETTING_CLOUD_SHADOW] = LLSDArray(settings[SETTING_CLOUD_SHADOW].asReal())(0.0f)(0.0f)(1.0f); - legacy[SETTING_GAMMA] = LLSDArray(settings[SETTING_GAMMA])(0.0f)(0.0f)(1.0f); + legacy[SETTING_LEGACY_ENABLE_CLOUD_SCROLL] = llsd::array(LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][0].asReal())), + LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][1].asReal()))); + legacy[SETTING_CLOUD_SHADOW] = llsd::array(settings[SETTING_CLOUD_SHADOW].asReal(), 0.0f, 0.0f, 1.0f); + legacy[SETTING_GAMMA] = llsd::array(settings[SETTING_GAMMA], 0.0f, 0.0f, 1.0f); legacy[SETTING_GLOW] = ensure_array_4(settings[SETTING_GLOW], 1.0); legacy[SETTING_LIGHT_NORMAL] = ensure_array_4(psky->getLightDirection().getValue(), 0.0f); - legacy[SETTING_MAX_Y] = LLSDArray(settings[SETTING_MAX_Y])(0.0f)(0.0f)(1.0f); + legacy[SETTING_MAX_Y] = llsd::array(settings[SETTING_MAX_Y], 0.0f, 0.0f, 1.0f); legacy[SETTING_STAR_BRIGHTNESS] = settings[SETTING_STAR_BRIGHTNESS].asReal() / 250.0f; // convert from 0-500 -> 0-2 ala pre-FS-compat changes legacy[SETTING_SUNLIGHT_COLOR] = ensure_array_4(settings[SETTING_SUNLIGHT_COLOR], 1.0f); @@ -1062,7 +1062,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyPreset(const std::string &n newsettings[SETTING_NAME] = name; - LLSD watertrack = LLSDArray( + LLSD watertrack = llsd::array( LLSDMap(SETTING_KEYKFRAME, LLSD::Real(0.0f)) (SETTING_KEYNAME, "water:Default")); @@ -1077,7 +1077,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyPreset(const std::string &n skytrack.append(entry); } - newsettings[SETTING_TRACKS] = LLSDArray(watertrack)(skytrack); + newsettings[SETTING_TRACKS] = llsd::array(watertrack, skytrack); LLSD frames(LLSD::emptyMap()); @@ -1165,7 +1165,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyMessage(const LLUUID ®io watersettings[SETTING_NAME] = watername; frames[watername] = watersettings; - LLSD watertrack = LLSDArray( + LLSD watertrack = llsd::array( LLSDMap(SETTING_KEYKFRAME, LLSD::Real(0.0f)) (SETTING_KEYNAME, watername)); @@ -1179,7 +1179,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyMessage(const LLUUID ®io LLSD newsettings = LLSDMap ( SETTING_NAME, "Region (legacy)" ) - ( SETTING_TRACKS, LLSDArray(watertrack)(skytrack)) + ( SETTING_TRACKS, llsd::array(watertrack, skytrack)) ( SETTING_FRAMES, frames ) ( SETTING_TYPE, "daycycle" ); @@ -1360,7 +1360,7 @@ LLSD LLSettingsVODay::convertToLegacy(const LLSettingsVODay::ptr_t &pday) skys[name.str()] = std::static_pointer_cast((*it).second); F32 frame = ((tracksky.size() == 1) && (it == tracksky.begin())) ? -1.0f : (*it).first; - llsdcycle.append( LLSDArray(LLSD::Real(frame))(name.str()) ); + llsdcycle.append( llsd::array(LLSD::Real(frame), name.str()) ); } LLSD llsdskylist(LLSD::emptyMap()); @@ -1373,7 +1373,7 @@ LLSD LLSettingsVODay::convertToLegacy(const LLSettingsVODay::ptr_t &pday) llsdskylist[(*its).first] = llsdsky; } - return LLSDArray(LLSD::emptyMap())(llsdcycle)(llsdskylist)(llsdwater); + return llsd::array(LLSD::emptyMap(), llsdcycle, llsdskylist, llsdwater); } LLSettingsSkyPtr_t LLSettingsVODay::getDefaultSky() const -- cgit v1.2.3 From 4093d5b1ebe6b0eb50473d5161042ac3a1b7f6b2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 Jan 2023 15:13:02 -0500 Subject: DRTVWR-575: Use llsdutil.h functions for LLFloaterLandHoldings LLSD LLFloaterLandHoldings::postBuild() was constructing an LLSD structure by assigning each map entry and array element one at a time. Chorazinallen identified a crash bug possibly caused by destroying that LLSD structure. Diagnostically try building it using nested llsd::map() and llsd::array() calls instead to see if that improves matters. --- indra/newview/llfloaterlandholdings.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp index 8633fe4e5e..a3222d622f 100644 --- a/indra/newview/llfloaterlandholdings.cpp +++ b/indra/newview/llfloaterlandholdings.cpp @@ -39,6 +39,7 @@ #include "llfloaterworldmap.h" #include "llproductinforequest.h" #include "llscrolllistctrl.h" +#include "llsdutil.h" #include "llstatusbar.h" #include "lltextbox.h" #include "llscrolllistctrl.h" @@ -79,24 +80,25 @@ BOOL LLFloaterLandHoldings::postBuild() for(S32 i = 0; i < count; ++i) { LLUUID id(gAgent.mGroups.at(i).mID); - - LLSD element; - element["id"] = id; - element["columns"][0]["column"] = "group"; - element["columns"][0]["value"] = gAgent.mGroups.at(i).mName; - element["columns"][0]["font"] = "SANSSERIF"; - LLUIString areastr = getString("area_string"); areastr.setArg("[AREA]", llformat("%d", gAgent.mGroups.at(i).mContribution)); - element["columns"][1]["column"] = "area"; - element["columns"][1]["value"] = areastr; - element["columns"][1]["font"] = "SANSSERIF"; - grant_list->addElement(element); + grant_list->addElement( + llsd::map( + "id", id, + "columns", llsd::array( + llsd::map( + "column", "group", + "value", gAgent.mGroups.at(i).mName, + "font", "SANSSERIF"), + llsd::map( + "column", "area", + "value", areastr, + "font", "SANSSERIF")))); } - + center(); - + return TRUE; } @@ -108,8 +110,8 @@ LLFloaterLandHoldings::~LLFloaterLandHoldings() void LLFloaterLandHoldings::onOpen(const LLSD& key) { - LLScrollListCtrl *list = getChild("parcel list"); - list->clearRows(); + LLScrollListCtrl *list = getChild("parcel list"); + list->clearRows(); // query_id null is known to be us const LLUUID& query_id = LLUUID::null; -- cgit v1.2.3 From f3cd329b585ef55a66f2a824f010d1a54d67d8d2 Mon Sep 17 00:00:00 2001 From: akleshchev <117672381+akleshchev@users.noreply.github.com> Date: Tue, 10 Jan 2023 19:38:44 +0200 Subject: SL-18911 My Land Holdings floater crashes viewer on the Xcode/+Monterey branches (#47) Revert part of "DRTVWR-575: Address review comments on Xcode 14.1 type tweaks." Crash was reproduced when assigning areastr to llsd, but likely present in other cases of assigning ui strings to llsd (instead of going for lluistring's result directly copy constructor was engaged and either copy or original crashed due to invalid pointers, copy shouldn't have been created). --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d97ed61e11..5266db5b38 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6284,7 +6284,7 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response) // More than OFFER_RECIPIENT_LIMIT targets will overload the message // producing an llerror. LLSD args; - args["OFFERS"] = notification["payload"]["ids"].size(); + args["OFFERS"] = LLSD::Integer(notification["payload"]["ids"].size()); args["LIMIT"] = static_cast(OFFER_RECIPIENT_LIMIT); LLNotificationsUtil::add("TooManyTeleportOffers", args); return false; -- cgit v1.2.3 From a1931d8cc4820eb4e20f1346fc7c3e0139c5863b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 16 Jan 2023 04:42:33 +0200 Subject: SL-18735 Using "Find original" in main inventory tab breaks inventory view Fixes folders being invidible (missing arrange) Fixes sroll to target not working reliably --- indra/newview/lleventpoll.cpp | 5 +++-- indra/newview/llfolderviewmodelinventory.cpp | 6 +++++- indra/newview/llstartup.cpp | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 6f3f6e9166..26782e53f0 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -247,8 +247,9 @@ namespace Details errorCount = 0; if (!result.isMap() || - !result.get("events") || - !result.get("id")) + !result.has("events") || + !result["events"].isArray() || + !result.has("id")) { LL_WARNS("LLEventPollImpl") << " <" << counter << "> received event poll with no events or id key: " << result << LL_ENDL; continue; diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index b6d856e31b..241aa96bc8 100644 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -182,11 +182,15 @@ void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_gen bool generation_skip = mMarkedDirtyGeneration >= 0 && mPrevPassedAllFilters && mMarkedDirtyGeneration < mRootViewModel.getFilter().getFirstSuccessGeneration(); + S32 last_generation = mLastFilterGeneration; LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size); bool before = mPrevPassedAllFilters; mPrevPassedAllFilters = passedFilter(filter_generation); - if (before != mPrevPassedAllFilters || generation_skip) + if (before != mPrevPassedAllFilters // Change of state + || generation_skip // Was marked dirty + // Potential change from being in-progress and invisible to visible) + || (mPrevPassedAllFilters && last_generation < mRootViewModel.getFilter().getFirstRequiredGeneration())) { // Need to rearrange the folder if the filtered state of the item changed, // previously passed item skipped filter generation changes while being dirty diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 1dd5c5cbe5..10293a90c8 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -324,6 +324,8 @@ void set_flags_and_update_appearance() { LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); LLAppearanceMgr::instance().updateAppearanceFromCOF(true, true, no_op); + + LLInventoryModelBackgroundFetch::instance().start(); } // Returns false to skip other idle processing. Should only return -- cgit v1.2.3 From a94f907a17aa754a3c75dbf5491b57fdde466367 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 20 Jan 2023 23:43:48 +0200 Subject: SL-18989 Saved notifications some times stops displaying information --- indra/newview/lltoast.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index bf56a10d4d..223aaad811 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -220,7 +220,11 @@ void LLToast::hide() /*virtual*/ void LLToast::setFocus(BOOL b) { - if (b && !hasFocus() && mPanel) + if (b + && !hasFocus() + && mPanel + && mWrapperPanel + && !mWrapperPanel->getChildList()->empty()) { LLModalDialog::setFocus(TRUE); // mostly for buttons @@ -416,15 +420,18 @@ void LLToast::setVisible(BOOL show) //hide "hide" button in case toast was hidden without mouse_leave if(mHideBtn) mHideBtn->setVisible(show); - } - LLFloater::setVisible(show); - if(mPanel) - { - if(!mPanel->isDead()) - { - mPanel->setVisible(show); - } - } + } + LLFloater::setVisible(show); + if (mPanel + && !mPanel->isDead() + && mWrapperPanel + && !mWrapperPanel->getChildList()->empty() + // LLInspectToast can take over, but LLToast still appears to act like a data storage + && mPanel->getParent() == mWrapperPanel + ) + { + mPanel->setVisible(show); + } } void LLToast::updateHoveredState() -- cgit v1.2.3 From 1109fca197325b0e081c8c2b9ed7c9e455035e83 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 24 Jan 2023 14:14:37 +0200 Subject: SL-19025 Fix for object's context menu Inspect and copy doesn't work for face or child selection. Disable them in such cases. --- indra/newview/llviewermenu.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c796ed30f7..37227518f5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2876,6 +2876,13 @@ void handle_object_open() LLFloaterReg::showInstance("openobject"); } +bool enable_object_inspect() +{ + LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); + LLViewerObject* selected_objectp = selection->getFirstRootObject(); + return selected_objectp != NULL; +} + bool enable_object_open() { // Look for contents in root object, which is all the LLFloaterOpenObject @@ -7943,7 +7950,7 @@ bool enable_object_take_copy() bool all_valid = false; if (LLSelectMgr::getInstance()) { - if (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) + if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0) { all_valid = true; #ifndef HACKED_GODLIKE_VIEWER @@ -9650,6 +9657,7 @@ void initialize_menus() commit.add("Object.Open", boost::bind(&handle_object_open)); commit.add("Object.Take", boost::bind(&handle_take)); commit.add("Object.ShowInspector", boost::bind(&handle_object_show_inspector)); + enable.add("Object.EnableInspect", boost::bind(&enable_object_inspect)); enable.add("Object.EnableOpen", boost::bind(&enable_object_open)); enable.add("Object.EnableTouch", boost::bind(&enable_object_touch, _1)); enable.add("Object.EnableDelete", boost::bind(&enable_object_delete)); -- cgit v1.2.3 From 11b9b6f5f826c26673b79360c79daae7061c9569 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 24 Jan 2023 09:19:00 +0200 Subject: INTL-477 Translation update for Maint S --- .../skins/default/xui/de/floater_about_land.xml | 483 +- .../default/xui/de/floater_avatar_textures.xml | 34 +- .../skins/default/xui/de/floater_camera.xml | 55 +- .../default/xui/de/floater_camera_presets.xml | 2 + .../skins/default/xui/de/floater_forget_user.xml | 2 + .../skins/default/xui/de/floater_linkreplace.xml | 2 + .../skins/default/xui/de/floater_people.xml | 3 +- .../xui/de/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/de/floater_preview_trash.xml | 7 + .../default/xui/de/floater_save_camera_preset.xml | 7 + .../default/xui/de/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/de/menu_viewer.xml | 12 +- .../newview/skins/default/xui/de/notifications.xml | 3125 +++----- .../xui/de/panel_group_creation_sidetray.xml | 30 + .../skins/default/xui/de/panel_group_roles.xml | 107 +- indra/newview/skins/default/xui/de/panel_login.xml | 20 +- .../xui/de/panel_notification_list_item.xml | 39 + .../skins/default/xui/de/panel_outfit_gallery.xml | 7 + .../default/xui/de/panel_outfit_gallery_item.xml | 7 + .../default/xui/de/panel_preferences_sound.xml | 23 +- .../default/xui/de/panel_prim_media_controls.xml | 11 +- .../skins/default/xui/de/panel_progress.xml | 10 + .../default/xui/de/panel_region_environment.xml | 100 +- indra/newview/skins/default/xui/de/strings.xml | 7784 +++++-------------- .../skins/default/xui/de/teleport_strings.xml | 123 +- .../skins/default/xui/de/widgets/density_ctrl.xml | 2 + .../xui/es/floater_animation_anim_preview.xml | 2 + .../xui/es/floater_animation_bvh_preview.xml | 45 + .../default/xui/es/floater_avatar_textures.xml | 30 +- .../skins/default/xui/es/floater_camera.xml | 55 +- .../default/xui/es/floater_camera_presets.xml | 2 + .../skins/default/xui/es/floater_forget_user.xml | 2 + .../skins/default/xui/es/floater_god_tools.xml | 63 +- .../skins/default/xui/es/floater_linkreplace.xml | 2 + .../skins/default/xui/es/floater_media_browser.xml | 14 +- .../skins/default/xui/es/floater_notification.xml | 2 + .../skins/default/xui/es/floater_people.xml | 3 +- .../xui/es/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/es/floater_preview_trash.xml | 7 + .../default/xui/es/floater_save_camera_preset.xml | 7 + .../newview/skins/default/xui/es/floater_stats.xml | 13 +- .../newview/skins/default/xui/es/floater_tools.xml | 307 +- .../default/xui/es/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/es/menu_login.xml | 7 +- indra/newview/skins/default/xui/es/menu_viewer.xml | 80 +- .../newview/skins/default/xui/es/notifications.xml | 3239 +++----- .../skins/default/xui/es/panel_avatar_tag.xml | 7 + .../skins/default/xui/es/panel_chat_header.xml | 2 + .../xui/es/panel_group_creation_sidetray.xml | 30 + .../skins/default/xui/es/panel_group_roles.xml | 97 +- .../skins/default/xui/es/panel_instant_message.xml | 2 + .../skins/default/xui/es/panel_landmark_info.xml | 19 +- indra/newview/skins/default/xui/es/panel_login.xml | 20 +- .../xui/es/panel_notification_list_item.xml | 38 + .../default/xui/es/panel_notifications_channel.xml | 10 + .../skins/default/xui/es/panel_outfit_gallery.xml | 7 + .../default/xui/es/panel_outfit_gallery_item.xml | 7 + .../default/xui/es/panel_preferences_sound.xml | 25 +- .../default/xui/es/panel_prim_media_controls.xml | 19 +- .../skins/default/xui/es/panel_progress.xml | 10 + .../default/xui/es/panel_region_environment.xml | 100 +- .../skins/default/xui/es/sidepanel_appearance.xml | 7 +- indra/newview/skins/default/xui/es/strings.xml | 7654 +++++-------------- .../skins/default/xui/es/teleport_strings.xml | 119 +- .../skins/default/xui/es/widgets/density_ctrl.xml | 2 + .../default/xui/fr/floater_avatar_textures.xml | 30 +- .../skins/default/xui/fr/floater_camera.xml | 55 +- .../default/xui/fr/floater_camera_presets.xml | 2 + .../skins/default/xui/fr/floater_forget_user.xml | 2 + .../skins/default/xui/fr/floater_linkreplace.xml | 2 + .../skins/default/xui/fr/floater_people.xml | 3 +- .../xui/fr/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/fr/floater_preview_trash.xml | 7 + .../default/xui/fr/floater_save_camera_preset.xml | 7 + .../default/xui/fr/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 75 +- .../newview/skins/default/xui/fr/notifications.xml | 3620 +++------ .../xui/fr/panel_group_creation_sidetray.xml | 30 + .../skins/default/xui/fr/panel_group_roles.xml | 115 +- indra/newview/skins/default/xui/fr/panel_login.xml | 22 +- .../xui/fr/panel_notification_list_item.xml | 39 + .../skins/default/xui/fr/panel_outfit_gallery.xml | 7 + .../default/xui/fr/panel_outfit_gallery_item.xml | 7 + .../default/xui/fr/panel_preferences_sound.xml | 31 +- .../default/xui/fr/panel_prim_media_controls.xml | 15 +- .../skins/default/xui/fr/panel_progress.xml | 10 + .../default/xui/fr/panel_region_environment.xml | 114 +- indra/newview/skins/default/xui/fr/strings.xml | 7816 +++++--------------- .../skins/default/xui/fr/teleport_strings.xml | 121 +- .../skins/default/xui/fr/widgets/density_ctrl.xml | 2 + .../default/xui/it/floater_avatar_textures.xml | 34 +- .../skins/default/xui/it/floater_camera.xml | 57 +- .../default/xui/it/floater_camera_presets.xml | 2 + .../skins/default/xui/it/floater_forget_user.xml | 2 + .../skins/default/xui/it/floater_god_tools.xml | 57 +- .../skins/default/xui/it/floater_linkreplace.xml | 2 + .../skins/default/xui/it/floater_media_browser.xml | 14 +- .../skins/default/xui/it/floater_notification.xml | 2 + .../xui/it/floater_notifications_console.xml | 2 + .../skins/default/xui/it/floater_people.xml | 3 +- .../xui/it/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/it/floater_preview_trash.xml | 9 + .../default/xui/it/floater_save_camera_preset.xml | 7 + .../newview/skins/default/xui/it/floater_stats.xml | 15 +- .../default/xui/it/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/it/menu_login.xml | 3 +- indra/newview/skins/default/xui/it/menu_viewer.xml | 95 +- .../newview/skins/default/xui/it/notifications.xml | 3473 +++------ .../skins/default/xui/it/panel_avatar_tag.xml | 7 + .../skins/default/xui/it/panel_chat_header.xml | 2 + .../xui/it/panel_group_creation_sidetray.xml | 30 + .../skins/default/xui/it/panel_group_roles.xml | 103 +- .../skins/default/xui/it/panel_instant_message.xml | 6 + .../skins/default/xui/it/panel_landmark_info.xml | 21 +- indra/newview/skins/default/xui/it/panel_login.xml | 20 +- .../xui/it/panel_notification_list_item.xml | 44 + .../default/xui/it/panel_notifications_channel.xml | 10 + .../skins/default/xui/it/panel_outfit_gallery.xml | 11 + .../default/xui/it/panel_outfit_gallery_item.xml | 7 + .../skins/default/xui/it/panel_place_profile.xml | 41 +- .../default/xui/it/panel_preferences_sound.xml | 29 +- .../default/xui/it/panel_prim_media_controls.xml | 21 +- .../skins/default/xui/it/panel_progress.xml | 10 + .../default/xui/it/panel_region_environment.xml | 100 +- .../skins/default/xui/it/sidepanel_appearance.xml | 7 +- indra/newview/skins/default/xui/it/strings.xml | 7688 +++++-------------- .../skins/default/xui/it/teleport_strings.xml | 117 +- .../skins/default/xui/it/widgets/density_ctrl.xml | 2 + .../default/xui/ja/floater_avatar_textures.xml | 34 +- .../skins/default/xui/ja/floater_camera.xml | 55 +- .../default/xui/ja/floater_camera_presets.xml | 2 + .../skins/default/xui/ja/floater_forget_user.xml | 2 + .../skins/default/xui/ja/floater_linkreplace.xml | 2 + .../skins/default/xui/ja/floater_people.xml | 3 +- .../xui/ja/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/ja/floater_preview_trash.xml | 7 + .../default/xui/ja/floater_save_camera_preset.xml | 7 + .../default/xui/ja/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/ja/menu_viewer.xml | 7 +- .../newview/skins/default/xui/ja/notifications.xml | 3164 +++----- .../xui/ja/panel_group_creation_sidetray.xml | 30 + .../skins/default/xui/ja/panel_group_roles.xml | 105 +- indra/newview/skins/default/xui/ja/panel_login.xml | 20 +- .../xui/ja/panel_notification_list_item.xml | 39 + .../skins/default/xui/ja/panel_outfit_gallery.xml | 7 + .../default/xui/ja/panel_outfit_gallery_item.xml | 7 + .../default/xui/ja/panel_preferences_sound.xml | 23 +- .../default/xui/ja/panel_prim_media_controls.xml | 11 +- .../skins/default/xui/ja/panel_progress.xml | 10 + .../default/xui/ja/panel_region_environment.xml | 100 +- indra/newview/skins/default/xui/ja/strings.xml | 7784 +++++-------------- .../skins/default/xui/ja/teleport_strings.xml | 125 +- .../skins/default/xui/ja/widgets/density_ctrl.xml | 2 + .../default/xui/pt/floater_avatar_textures.xml | 34 +- .../skins/default/xui/pt/floater_camera.xml | 55 +- .../default/xui/pt/floater_camera_presets.xml | 2 + .../skins/default/xui/pt/floater_forget_user.xml | 2 + .../skins/default/xui/pt/floater_god_tools.xml | 63 +- .../skins/default/xui/pt/floater_linkreplace.xml | 2 + .../skins/default/xui/pt/floater_media_browser.xml | 14 +- .../skins/default/xui/pt/floater_notification.xml | 2 + .../skins/default/xui/pt/floater_people.xml | 3 +- .../xui/pt/floater_preferences_view_advanced.xml | 2 + .../skins/default/xui/pt/floater_preview_trash.xml | 7 + .../default/xui/pt/floater_save_camera_preset.xml | 7 + .../newview/skins/default/xui/pt/floater_stats.xml | 13 +- .../default/xui/pt/menu_gallery_outfit_tab.xml | 23 + indra/newview/skins/default/xui/pt/menu_login.xml | 3 +- indra/newview/skins/default/xui/pt/menu_viewer.xml | 81 +- .../newview/skins/default/xui/pt/notifications.xml | 3208 +++----- .../skins/default/xui/pt/panel_avatar_tag.xml | 7 + .../skins/default/xui/pt/panel_chat_header.xml | 2 + .../xui/pt/panel_group_creation_sidetray.xml | 31 + .../skins/default/xui/pt/panel_group_roles.xml | 95 +- .../skins/default/xui/pt/panel_instant_message.xml | 2 + .../skins/default/xui/pt/panel_landmark_info.xml | 21 +- indra/newview/skins/default/xui/pt/panel_login.xml | 20 +- .../xui/pt/panel_notification_list_item.xml | 39 + .../default/xui/pt/panel_notifications_channel.xml | 10 + .../skins/default/xui/pt/panel_outfit_gallery.xml | 7 + .../default/xui/pt/panel_outfit_gallery_item.xml | 7 + .../default/xui/pt/panel_preferences_sound.xml | 23 +- .../default/xui/pt/panel_prim_media_controls.xml | 19 +- .../skins/default/xui/pt/panel_progress.xml | 10 + .../default/xui/pt/panel_region_environment.xml | 100 +- .../newview/skins/default/xui/pt/role_actions.xml | 41 +- .../skins/default/xui/pt/sidepanel_appearance.xml | 7 +- indra/newview/skins/default/xui/pt/strings.xml | 7618 +++++-------------- .../skins/default/xui/pt/teleport_strings.xml | 117 +- .../skins/default/xui/pt/widgets/density_ctrl.xml | 2 + 190 files changed, 20252 insertions(+), 51353 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/de/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/de/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/de/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/de/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/de/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/de/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/de/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/de/widgets/density_ctrl.xml create mode 100644 indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml create mode 100644 indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml create mode 100644 indra/newview/skins/default/xui/es/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/es/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/es/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/es/floater_notification.xml create mode 100644 indra/newview/skins/default/xui/es/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/es/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/es/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/es/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/es/panel_avatar_tag.xml create mode 100644 indra/newview/skins/default/xui/es/panel_chat_header.xml create mode 100644 indra/newview/skins/default/xui/es/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/es/panel_instant_message.xml create mode 100644 indra/newview/skins/default/xui/es/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/es/panel_notifications_channel.xml create mode 100644 indra/newview/skins/default/xui/es/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/es/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/es/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/es/widgets/density_ctrl.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml create mode 100644 indra/newview/skins/default/xui/it/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/it/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/it/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/it/floater_notification.xml create mode 100644 indra/newview/skins/default/xui/it/floater_notifications_console.xml create mode 100644 indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/it/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/it/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/it/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/it/panel_avatar_tag.xml create mode 100644 indra/newview/skins/default/xui/it/panel_chat_header.xml create mode 100644 indra/newview/skins/default/xui/it/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/it/panel_instant_message.xml create mode 100644 indra/newview/skins/default/xui/it/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/it/panel_notifications_channel.xml create mode 100644 indra/newview/skins/default/xui/it/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/it/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/it/widgets/density_ctrl.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_camera_presets.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_forget_user.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_linkreplace.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_notification.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_preview_trash.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_gallery_outfit_tab.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_avatar_tag.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_chat_header.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_group_creation_sidetray.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_instant_message.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_notification_list_item.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_notifications_channel.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_outfit_gallery.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_outfit_gallery_item.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_progress.xml create mode 100644 indra/newview/skins/default/xui/pt/widgets/density_ctrl.xml (limited to 'indra/newview') 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 8f55b3297f..bb9ab26ef5 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -1,146 +1,58 @@ - + - - "Parcel_PG_Dark" - - - "Parcel_M_Dark" - - - "Parcel_R_Dark" - - - [HOURS] Stunden - - - Std. - - - [MINUTES] Min. - - - Min. - - - [SECONDS] Sek. - - - Restzeit - - - Immer - + "Parcel_PG_Dark" + "Parcel_M_Dark" + "Parcel_R_Dark" + [HOURS] Stunden + Std. + [MINUTES] Min. + Min. + [SECONDS] Sek. + Restzeit + Immer - - Nur neue Benutzer - - - Jeder - - - Gebiet: - - - [AREA] m². - - - Auktions-ID: [ID] - - - Bestätigen Sie den Kauf, um dieses Land zu bearbeiten. - - - (In Gruppenbesitz) - - - Profil - - - Info - - - (öffentlich) - - - (keiner) - - - (Wird verkauft) - - - 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] - - - Name: - - - Beschreibung: - - - Typ: - - - Mainland / Homestead - - - Einstufung: - - - Adult - - - Eigentümer: - - - Gruppe: - + Nur neue Benutzer + Jeder + Gebiet: + [AREA] m². + Auktions-ID: [ID] + Bestätigen Sie den Kauf, um dieses Land zu bearbeiten. + (In Gruppenbesitz) + Profil + Info + (öffentlich) + (keiner) + (Wird verkauft) + 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] + Name: + Beschreibung: + Typ: + Mainland / Homestead + Einstufung: + Adult + Eigentümer: + Gruppe: