From d51984cbb2190259d8db41edcd81020aef87dedf Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 9 Dec 2020 20:07:07 +0100 Subject: [PATCH 01/47] Updated Polish translation --- indra/newview/skins/default/xui/en/floater_phototools.xml | 2 +- indra/newview/skins/default/xui/pl/floater_model_preview.xml | 2 +- indra/newview/skins/default/xui/pl/floater_phototools.xml | 1 + indra/newview/skins/default/xui/pl/menu_viewer.xml | 1 + .../skins/default/xui/pl/panel_preferences_graphics1.xml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml index 050dc393d6..edcf55702d 100644 --- a/indra/newview/skins/default/xui/en/floater_phototools.xml +++ b/indra/newview/skins/default/xui/en/floater_phototools.xml @@ -1461,7 +1461,7 @@ label="Depth of Field focus follows pointer" layout="topleft" name="FSFocusPointFollowsPointer" - tool_tip="Depth of Field focus will follow your mouse, this behaviour matches that seen when using flycam. Use in conjunction with lock" + tool_tip="Depth of Field (DoF) focus will follow your mouse, this behaviour matches that seen when using flycam. Use in conjunction with DoF focus lock" top_pad="4" width="256"/> - Kolory podglądu przesyłania: + Kolory podglądu przesyłania: Ogólne: diff --git a/indra/newview/skins/default/xui/pl/floater_phototools.xml b/indra/newview/skins/default/xui/pl/floater_phototools.xml index 586c39d3aa..1ba9fa3e6d 100644 --- a/indra/newview/skins/default/xui/pl/floater_phototools.xml +++ b/indra/newview/skins/default/xui/pl/floater_phototools.xml @@ -166,6 +166,7 @@ + diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 6590b785f8..e4f06f1a96 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -133,6 +133,7 @@ + diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index 5b9a8f5e11..67abe1959d 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml @@ -168,6 +168,7 @@ + From 812f415759647d2280b347ceb16e98e787c158c2 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 9 Dec 2020 20:13:40 +0100 Subject: [PATCH 02/47] FIRE-30556 Russian translation update, by Romka Swallowtail --- indra/newview/skins/default/xui/ru/floater_phototools.xml | 2 ++ indra/newview/skins/default/xui/ru/menu_viewer.xml | 2 ++ .../skins/default/xui/ru/panel_preferences_graphics1.xml | 1 + 3 files changed, 5 insertions(+) diff --git a/indra/newview/skins/default/xui/ru/floater_phototools.xml b/indra/newview/skins/default/xui/ru/floater_phototools.xml index bc555af187..673cee8d36 100644 --- a/indra/newview/skins/default/xui/ru/floater_phototools.xml +++ b/indra/newview/skins/default/xui/ru/floater_phototools.xml @@ -193,6 +193,8 @@ tool_tip="Это включит Глубину Резкости, которая «определит расстояние между ближайшими и самыми дальними объектами в сцене, которые выглядят приемлемо резкими в изображении» (Википедия). Если вы не используете его, отключите его, и это ускорит частоту кадров. Если вы не можете включить эту функцию или не видите ее эффекта, включите «Расширенная модель освещения» на вкладке «Свет»." /> + diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index c3f773cd57..4c5c130479 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -159,6 +159,7 @@ + @@ -344,6 +345,7 @@ + diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml index f002c9e996..fc0ac4abe2 100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml @@ -171,6 +171,7 @@ + From 3e30c2d28f5bb354e1dd1d54b5b5723f27f243eb Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Dec 2020 09:27:47 +0100 Subject: [PATCH 03/47] Return value can only be false here - make it obvious --- indra/llaudio/llstreamingaudio_fmodstudio.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/llaudio/llstreamingaudio_fmodstudio.cpp b/indra/llaudio/llstreamingaudio_fmodstudio.cpp index 5fef19d6d2..0d3e58b3e5 100644 --- a/indra/llaudio/llstreamingaudio_fmodstudio.cpp +++ b/indra/llaudio/llstreamingaudio_fmodstudio.cpp @@ -392,6 +392,7 @@ void LLStreamingAudio_FMODSTUDIO::setGain(F32 vol) Check_FMOD_Error(mFMODInternetStreamChannelp->setVolume(vol), "FMOD::Channel::setVolume"); } } + // Streamtitle display // virtual bool LLStreamingAudio_FMODSTUDIO::getNewMetadata(LLSD& metadata) @@ -404,14 +405,17 @@ bool LLStreamingAudio_FMODSTUDIO::getNewMetadata(LLSD& metadata) mNewMetadata = false; return true; } - - return mNewMetadata; + else + { + return false; + } } metadata = LLSD(); return false; } // + /////////////////////////////////////////////////////// // manager of possibly-multiple internet audio streams From 34d23ffe29a6dd9f4877a07b02fa32ceaca5a89b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Dec 2020 13:13:21 +0100 Subject: [PATCH 04/47] Fix invalid XUI attribute --- indra/newview/skins/ansastorm/xui/en/floater_camera.xml | 1 - indra/newview/skins/default/xui/en/floater_camera.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/indra/newview/skins/ansastorm/xui/en/floater_camera.xml b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml index cc5f62062f..1a8e1977cc 100644 --- a/indra/newview/skins/ansastorm/xui/en/floater_camera.xml +++ b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml @@ -170,7 +170,6 @@ left_pad="2"> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 19ff362a24..3347c4b23e 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -74,7 +74,6 @@ left_pad="2"> From e8e9c970461c232c56b73600cc2bf78818ae4470 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Dec 2020 13:49:04 +0100 Subject: [PATCH 05/47] Fix arrows on joystick controls in phototools camera floater not showing "pressed" state --- indra/newview/llagentcamera.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 0bd8fbfa21..6f26b1fbc2 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1323,6 +1323,22 @@ void LLAgentCamera::updateCamera() gAgentCamera.getPanDownKey() > 0.f); // bottom } + // Phototools camera + camera_floater = LLFloaterReg::findTypedInstance("phototools_camera"); + if (camera_floater) + { + camera_floater->mRotate->setToggleState(gAgentCamera.getOrbitRightKey() > 0.f, // left + gAgentCamera.getOrbitUpKey() > 0.f, // top + gAgentCamera.getOrbitLeftKey() > 0.f, // right + gAgentCamera.getOrbitDownKey() > 0.f); // bottom + + camera_floater->mTrack->setToggleState(gAgentCamera.getPanLeftKey() > 0.f, // left + gAgentCamera.getPanUpKey() > 0.f, // top + gAgentCamera.getPanRightKey() > 0.f, // right + gAgentCamera.getPanDownKey() > 0.f); // bottom + } + // + // Handle camera movement based on keyboard. const F32 ORBIT_OVER_RATE = 90.f * DEG_TO_RAD; // radians per second const F32 ORBIT_AROUND_RATE = 90.f * DEG_TO_RAD; // radians per second From 81d89b5727f65157169628f993c6a2e7c9c4c341 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Dec 2020 14:25:16 +0100 Subject: [PATCH 06/47] Add option to use legacy, smaller camera floater without camera preset controls --- indra/newview/app_settings/commands.xml | 6 +- indra/newview/app_settings/settings.xml | 11 + indra/newview/llagentcamera.cpp | 16 + indra/newview/llfloatercamera.cpp | 85 +++- indra/newview/llfloatercamera.h | 2 + indra/newview/llviewerfloaterreg.cpp | 2 + indra/newview/llviewermenu.cpp | 27 +- .../xui/de/floater_fs_camera_small.xml | 57 +++ .../default/xui/de/panel_preferences_UI.xml | 1 + .../xui/en/floater_fs_camera_small.xml | 413 ++++++++++++++++++ .../skins/default/xui/en/menu_viewer.xml | 6 +- .../default/xui/en/panel_preferences_UI.xml | 19 +- 12 files changed, 626 insertions(+), 19 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_fs_camera_small.xml create mode 100644 indra/newview/skins/default/xui/en/floater_fs_camera_small.xml diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index ec4458ee66..8b3e8996e5 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -278,10 +278,8 @@ icon="Command_View_Icon" label_ref="Command_View_Label" tooltip_ref="Command_View_Tooltip" - execute_function="Floater.Toggle" - execute_parameters="camera" - is_running_function="Floater.IsOpen" - is_running_parameters="camera" + execute_function="View.ToggleCameraFloater" + is_running_function="View.CheckCameraFloater" /> Value 1 + FSUseSmallCameraFloater + + Comment + If enabled, the camera floater will be smaller and not contain the camera preset controls. + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 6f26b1fbc2..23e6d443e1 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1339,6 +1339,22 @@ void LLAgentCamera::updateCamera() } // + // Optional small camera floater + camera_floater = LLFloaterReg::findTypedInstance("fs_camera_small"); + if (camera_floater) + { + camera_floater->mRotate->setToggleState(gAgentCamera.getOrbitRightKey() > 0.f, // left + gAgentCamera.getOrbitUpKey() > 0.f, // top + gAgentCamera.getOrbitLeftKey() > 0.f, // right + gAgentCamera.getOrbitDownKey() > 0.f); // bottom + + camera_floater->mTrack->setToggleState(gAgentCamera.getPanLeftKey() > 0.f, // left + gAgentCamera.getPanUpKey() > 0.f, // top + gAgentCamera.getPanRightKey() > 0.f, // right + gAgentCamera.getPanDownKey() > 0.f); // bottom + } + // + // Handle camera movement based on keyboard. const F32 ORBIT_OVER_RATE = 90.f * DEG_TO_RAD; // radians per second const F32 ORBIT_AROUND_RATE = 90.f * DEG_TO_RAD; // radians per second diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index c8786ef11d..d8e45acac7 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -268,6 +268,12 @@ void LLFloaterCamera::resetCameraMode() if (!floater_camera) return; floater_camera->switchMode(CAMERA_CTRL_MODE_PAN); // + + // Optional small camera floater + floater_camera = LLFloaterCamera::findSmallInstance(); + if (!floater_camera) return; + floater_camera->switchMode(CAMERA_CTRL_MODE_PAN); + // } void LLFloaterCamera::onAvatarEditingAppearance(bool editing) @@ -282,6 +288,12 @@ void LLFloaterCamera::onAvatarEditingAppearance(bool editing) if (!floater_camera) return; floater_camera->handleAvatarEditingAppearance(editing); // + + // Optional small camera floater + floater_camera = LLFloaterCamera::findSmallInstance(); + if (!floater_camera) return; + floater_camera->handleAvatarEditingAppearance(editing); + // } void LLFloaterCamera::handleAvatarEditingAppearance(bool editing) @@ -324,6 +336,18 @@ void LLFloaterCamera::toPrevMode() } } // + + // Optional small camera floater + floater_camera = LLFloaterCamera::findSmallInstance(); + if (floater_camera) + { + floater_camera->updateItemsSelection(); + if(floater_camera->inFreeCameraMode()) + { + activate_camera_tool(); + } + } + // } LLFloaterCamera* LLFloaterCamera::findInstance() @@ -338,6 +362,13 @@ LLFloaterCamera* LLFloaterCamera::findPhototoolsInstance() } // +// Optional small camera floater +LLFloaterCamera* LLFloaterCamera::findSmallInstance() +{ + return LLFloaterReg::findTypedInstance("fs_camera_small"); +} +// + void LLFloaterCamera::onOpen(const LLSD& key) { LLFirstUse::viewPopup(); @@ -353,7 +384,9 @@ void LLFloaterCamera::onOpen(const LLSD& key) toPrevMode(); mClosed = FALSE; - populatePresetCombo(); + // Optional small camera floater + if (mPresetCombo) + populatePresetCombo(); } void LLFloaterCamera::onClose(bool app_quitting) @@ -381,7 +414,8 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) : LLFloater(val), mClosed(FALSE), mCurrMode(CAMERA_CTRL_MODE_PAN), - mPrevMode(CAMERA_CTRL_MODE_PAN) + mPrevMode(CAMERA_CTRL_MODE_PAN), + mPresetCombo(nullptr) // Optional small camera floater { LLHints::getInstance()->registerHintTarget("view_popup", getHandle()); mCommitCallbackRegistrar.add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2)); @@ -395,7 +429,7 @@ BOOL LLFloaterCamera::postBuild() mRotate = getChild(ORBIT); mZoom = findChild(ZOOM); mTrack = getChild(PAN); - mPresetCombo = getChild("preset_combo"); + mPresetCombo = findChild("preset_combo"); // Optional small camera floater // Improved camera floater //getChild("precise_ctrs_label")->setShowCursorHand(false); @@ -421,8 +455,15 @@ BOOL LLFloaterCamera::postBuild() } // - mPresetCombo->setCommitCallback(boost::bind(&LLFloaterCamera::onCustomPresetSelected, this)); - LLPresetsManager::getInstance()->setPresetListChangeCameraCallback(boost::bind(&LLFloaterCamera::populatePresetCombo, this)); + // Optional small camera floater + //mPresetCombo->setCommitCallback(boost::bind(&LLFloaterCamera::onCustomPresetSelected, this)); + //LLPresetsManager::getInstance()->setPresetListChangeCameraCallback(boost::bind(&LLFloaterCamera::populatePresetCombo, this)); + if (mPresetCombo) + { + mPresetCombo->setCommitCallback(boost::bind(&LLFloaterCamera::onCustomPresetSelected, this)); + LLPresetsManager::getInstance()->setPresetListChangeCameraCallback(boost::bind(&LLFloaterCamera::populatePresetCombo, this)); + } + // update(); @@ -598,6 +639,19 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param) camera_floater->fromFreeToPresets(); } // + + // Optional small camera floater + camera_floater = LLFloaterCamera::findSmallInstance(); + if (camera_floater) + { + // FIRE-29950: Re-add weird legacy object view camera toggle + //camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA); + camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA); + // + camera_floater->updateItemsSelection(); + camera_floater->fromFreeToPresets(); + } + // } // Improved camera floater else if ("reset_view" == name) @@ -612,6 +666,12 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param) camera_floater->switchMode(CAMERA_CTRL_MODE_PAN); // + // Optional small camera floater + camera_floater = LLFloaterCamera::findSmallInstance(); + if (camera_floater) + camera_floater->switchMode(CAMERA_CTRL_MODE_PAN); + // + gAgentCamera.changeCameraToDefault(); switchToPreset("rear_view"); } @@ -628,6 +688,12 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param) camera_floater->switchMode(CAMERA_CTRL_MODE_PAN); // + // Optional small camera floater + camera_floater = LLFloaterCamera::findSmallInstance(); + if (camera_floater) + camera_floater->switchMode(CAMERA_CTRL_MODE_PAN); + // + switchToPreset(name); } } @@ -696,6 +762,15 @@ void LLFloaterCamera::switchToPreset(const std::string& name) camera_floater->fromFreeToPresets(); } // + + // Optional small camera floater + camera_floater = LLFloaterCamera::findSmallInstance(); + if (camera_floater) + { + camera_floater->updateItemsSelection(); + camera_floater->fromFreeToPresets(); + } + // } void LLFloaterCamera::fromFreeToPresets() diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 95572fec23..269e4d1617 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -95,6 +95,8 @@ private: static LLFloaterCamera* findInstance(); // Phototools camera static LLFloaterCamera* findPhototoolsInstance(); + // Optional small camera floater + static LLFloaterCamera* findSmallInstance(); /*virtual*/ BOOL postBuild(); diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 0375a3391a..643249ddd9 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -265,6 +265,8 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + // Optional small camera floater + LLFloaterReg::add("fs_camera_small", "floater_fs_camera_small.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("camera_presets", "floater_camera_presets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("chat_voice", "floater_voice_chat_volume.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // [FS communication UI] diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 65ade53e8e..f0a258c89e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -11367,6 +11367,27 @@ bool use_http_textures() } // +// Optional small camera floater +class FSToggleCameraFloater : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + std::string floater_name = gSavedSettings.getBOOL("FSUseSmallCameraFloater") ? "fs_camera_small" : "camera"; + LLFloaterReg::toggleInstance(floater_name); + return true; + } +}; + +class FSCheckCameraFloater : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + static LLCachedControl fsUseSmallCameraFloater(gSavedSettings, "FSUseSmallCameraFloater"); + return LLFloaterReg::instanceVisible(fsUseSmallCameraFloater ? "fs_camera_small" : "camera"); + } +}; +// + void initialize_menus() { // A parameterized event handler used as ctrl-8/9/0 zoom controls below. @@ -11462,7 +11483,11 @@ void initialize_menus() // Add reset camera angles menu view_listener_t::addMenu(new LLViewResetCameraAngles(), "View.ResetCameraAngles"); // - + // Optional small camera floater + view_listener_t::addMenu(new FSToggleCameraFloater(), "View.ToggleCameraFloater"); + view_listener_t::addMenu(new FSCheckCameraFloater(), "View.CheckCameraFloater"); + // + // Me > Movement view_listener_t::addMenu(new LLAdvancedAgentFlyingInfo(), "Agent.getFlying"); diff --git a/indra/newview/skins/default/xui/de/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/de/floater_fs_camera_small.xml new file mode 100644 index 0000000000..6751954dee --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_fs_camera_small.xml @@ -0,0 +1,57 @@ + + + + Kamera um Fokus drehen + + + Kamera auf Fokus zoomen + + + Kamera nach oben, unten, links und rechts bewegen + + + Objekt ansehen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml index 45d25ba9e3..bab6df298b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml @@ -119,6 +119,7 @@ + Eigene Fenster verwenden für: diff --git a/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml new file mode 100644 index 0000000000..4e6ad8ef75 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml @@ -0,0 +1,413 @@ + + + + + Rotate Camera Around Focus + + + Zoom Camera Towards Focus + + + Move Camera Up and Down, Left and Right + + +camera_modes_title + + +pan_mode_title + + +presets_mode_title + + +free_mode_title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "" + + + + + + + + + + "" + + + + + + + + + + "" + + + + + + + + + + + + + "" + + + + + + + + + + "" + + + + + + + + + + "" + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 4dc07478d7..06fafea440 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -238,11 +238,9 @@ label="Camera Controls" name="Camera Controls"> + function="View.CheckCameraFloater" /> + function="View.ToggleCameraFloater" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml index 7b78bba2bd..56701cc4a1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml @@ -783,11 +783,11 @@ name="FSInspectAvatarSlurlOpensProfile" tool_tip="If enabled, Firestorm will open the profile of an avatar directly when clicking on a link with its name" initial_value="true" - top_pad="8" + top_pad="6" left="10" width="250" /> + Date: Thu, 10 Dec 2020 14:53:13 +0100 Subject: [PATCH 07/47] Fix wrong arrow colors in camera floater in AnsaStorm skins --- .../textures/bottomtray/Cam_Rotate_In.png | Bin 0 -> 404 bytes .../textures/bottomtray/Cam_Tracking_In.png | Bin 0 -> 323 bytes .../blood/textures/bottomtray/Cam_Rotate_In.png | Bin 0 -> 405 bytes .../blood/textures/bottomtray/Cam_Tracking_In.png | Bin 0 -> 332 bytes .../textures/bottomtray/Cam_Rotate_In.png | Bin 0 -> 403 bytes .../textures/bottomtray/Cam_Tracking_In.png | Bin 0 -> 328 bytes .../textures/bottomtray/Cam_Rotate_In.png | Bin 0 -> 404 bytes .../textures/bottomtray/Cam_Tracking_In.png | Bin 0 -> 331 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/ansastorm/textures/bottomtray/Cam_Rotate_In.png create mode 100644 indra/newview/skins/ansastorm/textures/bottomtray/Cam_Tracking_In.png create mode 100644 indra/newview/skins/ansastorm/themes/blood/textures/bottomtray/Cam_Rotate_In.png create mode 100644 indra/newview/skins/ansastorm/themes/blood/textures/bottomtray/Cam_Tracking_In.png create mode 100644 indra/newview/skins/ansastorm/themes/classic_brown/textures/bottomtray/Cam_Rotate_In.png create mode 100644 indra/newview/skins/ansastorm/themes/classic_brown/textures/bottomtray/Cam_Tracking_In.png create mode 100644 indra/newview/skins/ansastorm/themes/ectoplasma/textures/bottomtray/Cam_Rotate_In.png create mode 100644 indra/newview/skins/ansastorm/themes/ectoplasma/textures/bottomtray/Cam_Tracking_In.png diff --git a/indra/newview/skins/ansastorm/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/ansastorm/textures/bottomtray/Cam_Rotate_In.png new file mode 100644 index 0000000000000000000000000000000000000000..afcfbf607196993820d35f8ada0785e3547ffb6e GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^ejv=j1|<7dDaZmT#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!22D>F$B>G+w^#N3m>orqe{5uG+QQ}T)Z`GN zAh34Ts>f2IcbaGW>|o_w%7Y^mI#0I z)qDK5!|KE8X)){G+Pu%dWToroeLwX@>*=S*&UODwdw%%Q-d}o-+A(^;*80C^``^>O z*ZuzN%a+rrY0pFJKd&|K{{E&qSn6TX%-cV2^B+9*$oA(wpWg*L@7%gs%kwWO^P^mC zzSCR#clWlh*LAbE|L@*j7izeshvyLM%2w;OJv>_r)Td5#+@WxYRZy>^z_Eo}DP}^{ zj>o4?Jm}?q)C=SZJZ!phNH)}s?O_v#xXTWOtp&}eP6Tj&Pbf||-e~#x<+pd+-$??) e2@`B!54y!5#iPoRJu8DBB<<!lvI6;>1s;*b3=DjSL74G){)!Z!;0;d~$B>G+w^t749&!+9yU1IAK$&mj8DCoprhHRkh^T zL$+?xr;e@`&9lB0pcOZ_;QV6V)JIo2zHiTP?yPvv|2=BU!?zz-{e4{bYg_KE=|Atq z+E-32P<-fgsI`TgQ(Q<-CB|dN1OfspqISGbJ$JfBulU90cdvJU?eqQo^v3r4^X@VN e{Q?Ie*KUc%JF7FrXr-S733|HvxvX!lvI6;>1s;*b3=DjSL74G){)!Z!1}#q)$B>G+w^wbwm;*)H9(KBMZ`{nyqNAhZ zqT{2=(d26O$nH+p?hOJh4O4qhh=_?f9Vq<~`)tCo`Kyqb-XP+^y6OudUu6WAlCE?G4<^Gt{k?9nMW%S>eAidIQ(;3}e~fhu=;% zKU&?h*K&42SJ|@12|H?Ehklex%0HzvXHo2nA8*?qxPE+>oWHEn!gcm*4f*E%FGSy) zeN(&h@A10izmt;w{`g~`d*o%(b|W*6=}*M+mK&MfIg}fIjP2nhj_EEtR1T>M>U9=) z<~`h|mE3Hu*9k-go-N)*+~(_gc;S*}+R2A?@AN+NDqeN7TeJG-S{r6yKw*Mw4%cfL X64q#&?D|o?7$oiK>gTe~DWM4fCoQ7F literal 0 HcmV?d00001 diff --git a/indra/newview/skins/ansastorm/themes/blood/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/ansastorm/themes/blood/textures/bottomtray/Cam_Tracking_In.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ce710bf698764bbe41a49c99fe0b4029139ec0 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^ejv=j1|<7dDaZmT#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;6qOr$B>G+w^#P&GC7L0UOei$gU3su=+OyX z2lo<&R)Ih!-5mne;b&C-6bsM0V0r2Co}0d5@f(=))3(pZUzT~jDDADzQr2j>{KMa} z>m#=A?J0Wbx2W{#qp4iws!`!uaWf0b7nPnfvbo9_HCAXUOnf$*=0N1+4l-h<{AFa jd_6PzJ!lvI6;>1s;*b3=DjSL74G){)!Z!1`SUa$B>G+w^w!joE=5l9zF~=*aBM?OEYR ztGo7E&o1aHTlzRsGIhKhU4n^cYDF_-i?ksR1T>M>U9=)ws!lvI6;>1s;*b3=DjSL74G){)!Z!;9XA_$B>G+w^uG^GC7L0UA(CD##3O8!UEZw zjf~MA?qWjah0jzkuK3?Qy?`&~*|~S8KiTFyo^P3Zt8iYOZu-UZK~)>>e!XUAzwg$* z_o-93zboGg(2HAHP`-$F>7%Kf-xY2JsKs>__`6Aa9jUI~A-o6&cAxF+XWuV8oq2g%?cb;C g%YptufTdf@7(Yv@lx4o<7XgWSy85}Sb4q9e0JVgC$p8QV literal 0 HcmV?d00001 diff --git a/indra/newview/skins/ansastorm/themes/ectoplasma/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/ansastorm/themes/ectoplasma/textures/bottomtray/Cam_Rotate_In.png new file mode 100644 index 0000000000000000000000000000000000000000..be2bb347bcb51484ec38435540cac804d8b4b46f GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^ejv=j1|<7dDaZmT#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!22D>F$B>G+w^wbwoE=5l9=^_3EPL6~(7M32 zOC&1t=FW+44%aRz5-$r2Gt&%`*ucS2_U>T*j&_qkb<5Vzg7?_@iq*DP?|f2r!?5|~ z)6khaZr$v@+||@uGUw~|cb~I2%{ZQSSZ~gv-cp|5w@3;oL$gWw)*j+{eNG@evC`XKczHh(cPCfzBqqaR&jo#`DGg*_qB$6bM6_@_nP0- z?)-Z!m-KgH(%+wd?B5=L`Dlxg8OQV|V(*q1ncX=g8-9%K;UtdfE<02XsS4_K7I@}8 z?9)naHrML}q5{tr?;`H<2ubM{Z>1Qahm(LBLXNdX?{GisQoL63$dtW*!samo!wC~u bFL=F=F=e_|-)TSg{UB*iS3j3^P6!lvI6;>1s;*b3=DjSL74G){)!Z!-~&$=$B>G+w^ugiGC2ygT|BI-aFJ=N#UfUY z7wvNxZWXdGv7~d&%CvDPNcPW=D};%Zx`6) z?l;TTUmUYT{^G8pk6x|2h1Y6}uJ_qdzo<0z(NvD_30u~=?3vzPZ4~wWQ^nPPh0nL$ zGdZU9d9VE2C!U8|TevyJh4fTnJa$YdP<-e_Kwx3k!+pnZ_I|cJx9IE^|MSbr?- Date: Thu, 10 Dec 2020 15:02:56 +0100 Subject: [PATCH 08/47] Automatically switch to other camera floater when flipping small camera floater option while it is visible --- indra/newview/llviewercontrol.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 48f9ed7477..eebce59f9a 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -1019,6 +1019,20 @@ void handleRenderHiDPIChanged(const LLSD& newvalue) } // FIRE-24081 +// Optional small camera floater +void handleSmallCameraFloaterChanged(const LLSD& newValue) +{ + std::string old_floater_name = newValue.asBoolean() ? "camera" : "fs_camera_small"; + std::string new_floater_name = newValue.asBoolean() ? "fs_camera_small" : "camera"; + + if (LLFloaterReg::instanceVisible(old_floater_name)) + { + LLFloaterReg::hideInstance(old_floater_name); + LLFloaterReg::showInstance(new_floater_name); + } +} +// + //////////////////////////////////////////////////////////////////////////// void settings_setup_listeners() @@ -1263,6 +1277,9 @@ void settings_setup_listeners() // Dynamic texture memory calculation gSavedSettings.getControl("FSDynamicTextureMemory")->getSignal()->connect(boost::bind(&handleDynamicTextureMemoryChanged, _2)); + + // Optional small camera floater + gSavedSettings.getControl("FSUseSmallCameraFloater")->getSignal()->connect(boost::bind(&handleSmallCameraFloaterChanged, _2)); } #if TEST_CACHED_CONTROL From adfc8ec1ced5e90f8b54f1c76402c64b94eb1305 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Dec 2020 15:51:58 +0100 Subject: [PATCH 09/47] Open correct camera floater from camera presets pulldown --- indra/newview/llpanelpresetscamerapulldown.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp index d21a484fb0..b1cbbe7931 100644 --- a/indra/newview/llpanelpresetscamerapulldown.cpp +++ b/indra/newview/llpanelpresetscamerapulldown.cpp @@ -146,5 +146,9 @@ void LLPanelPresetsCameraPulldown::onViewButtonClick(const LLSD& user_data) // close the minicontrol, we're bringing up the big one setVisible(FALSE); - LLFloaterReg::toggleInstanceOrBringToFront("camera"); + // Optional small camera floater + //LLFloaterReg::toggleInstanceOrBringToFront("camera"); + std::string floater_name = gSavedSettings.getBOOL("FSUseSmallCameraFloater") ? "fs_camera_small" : "camera"; + LLFloaterReg::toggleInstanceOrBringToFront(floater_name); + // } From 72f10f9ccf7cfb270357daaacec3c55fca64839b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 11 Dec 2020 11:06:15 +0100 Subject: [PATCH 10/47] FIRE-10883: Prevent context menu from going off screen --- indra/llui/llmenugl.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 1b2d49ea36..2252f5f5dd 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -4202,6 +4202,9 @@ void LLContextMenu::show(S32 x, S32 y, LLView* spawning_view) { y += height; } + + // FIRE-10883: Prevent context menu from going off screen + y = llmin(y, menu_region_rect.mTop); } // Open out to the left if menu extends past right edge @@ -4215,6 +4218,9 @@ void LLContextMenu::show(S32 x, S32 y, LLView* spawning_view) { x -= width; } + + // FIRE-10883: Prevent context menu from going off screen + x = llmax(x, menu_region_rect.mLeft); } S32 local_x, local_y; From 84d25e8098f053b1d56f826d2bfab057df7b4025 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 11 Dec 2020 12:12:58 +0100 Subject: [PATCH 11/47] FIRE-30571: Comboboxes select all items then pressing Page-Up --- indra/llui/llscrolllistctrl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 0c3fff25a5..f5206462a4 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -932,6 +932,8 @@ BOOL LLScrollListCtrl::selectFirstItem() // virtual BOOL LLScrollListCtrl::selectNthItem( S32 target_index ) { + // FIRE-30571: Comboboxes select all items then pressing Page-Up + target_index = llclamp(target_index, 0, (S32)mItemList.size() - 1); return selectItemRange(target_index, target_index); } From d68dcdcbed4e0c033374384839394b302a1e829e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 11 Dec 2020 22:27:48 +0100 Subject: [PATCH 12/47] FIRE-30583: Fix settings from marketplace folder being shown in quickprefs --- indra/newview/quickprefs.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp index 81570ce6e7..b9d272ec4f 100644 --- a/indra/newview/quickprefs.cpp +++ b/indra/newview/quickprefs.cpp @@ -61,12 +61,17 @@ class FSSettingsCollector : public LLInventoryCollectFunctor { public: - FSSettingsCollector() {} + FSSettingsCollector() + { + mMarketplaceFolderUUID = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false); + } + virtual ~FSSettingsCollector() {} bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) { if (item && item->getType() == LLAssetType::AT_SETTINGS && + !gInventory.isObjectDescendentOf(item->getUUID(), mMarketplaceFolderUUID) && mSeen.find(item->getAssetUUID()) == mSeen.end()) { mSeen.insert(item->getAssetUUID()); @@ -79,6 +84,7 @@ public: } protected: + LLUUID mMarketplaceFolderUUID; std::set mSeen; }; From c5835b95b744a2901eba421e7cf06621325e43f4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 12 Dec 2020 00:12:08 +0100 Subject: [PATCH 13/47] FIRE-30582: Fix out of range crash --- indra/newview/lllogchat.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 6a23d9acf1..3a8397fa37 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -470,7 +470,13 @@ void LLLogChat::loadChatHistory(const std::string& file_name, std::list& m if (is_group) { std::string old_name(file_name); - old_name.erase(old_name.size() - GROUP_CHAT_SUFFIX.size()); + // FIRE-30582: Fix out of range crash + //old_name.erase(old_name.size() - GROUP_CHAT_SUFFIX.size()); + if (LLStringUtil::endsWith(old_name, GROUP_CHAT_SUFFIX)) + { + old_name.erase(old_name.size() - GROUP_CHAT_SUFFIX.size()); + } + // fptr = LLFile::fopen(LLLogChat::makeLogFileName(old_name), "r"); if (fptr) { @@ -1234,7 +1240,13 @@ void LLLoadHistoryThread::loadHistory(const std::string& file_name, std::list FIRE-30582: Fix out of range crash + //old_name.erase(old_name.size() - GROUP_CHAT_SUFFIX.size()); + if (LLStringUtil::endsWith(old_name, GROUP_CHAT_SUFFIX)) + { + old_name.erase(old_name.size() - GROUP_CHAT_SUFFIX.size()); + } + // fptr = LLFile::fopen(LLLogChat::makeLogFileName(old_name), "r"); if (fptr) { From 0321670277fedd3455c83d82cbf92f7be99ea1b0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 12 Dec 2020 00:36:10 +0100 Subject: [PATCH 14/47] Fix conversation history for group chats sometimes displaying old (outdated) chat --- indra/newview/llfloaterconversationpreview.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index 75d2341ed8..3bd05cd86d 100644 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -102,11 +102,15 @@ BOOL LLFloaterConversationPreview::postBuild() file = "chat"; } mChatHistoryFileName = file; - // Obsolete because of https://bitbucket.org/lindenlab/viewer/commits/57b32eb01cd35bbac440569df885036eb24f2369 - //if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX)) - //{ - // mChatHistoryFileName += GROUP_CHAT_SUFFIX; - //} + // Broken version got removed in https://bitbucket.org/lindenlab/viewer/commits/57b32eb01cd35bbac440569df885036eb24f2369 + // but this is actually needed in the fixed form: If a group chat + // log is stored in conversation.log without the suffix, the filename + // will not be updated until the conversation is removed from the log, + // resulting in the old chat log being displayed. + if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX)) + { + mChatHistoryFileName += GROUP_CHAT_SUFFIX; + } // LLStringUtil::format_map_t args; args["[NAME]"] = name; From 5fa3005a5d34f5503e4fca46225cb8c4d26d582e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 12 Dec 2020 14:03:17 +0100 Subject: [PATCH 15/47] FIRE-9466: Fix scroll lists affecting camera zoom when using scroll wheel while list is scrolled at top/bottom --- indra/newview/skins/default/xui/en/widgets/scroll_list.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index e43989c6c7..89418ca132 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -13,7 +13,7 @@ draw_stripes="true" scroll_bar_bg_visible="false" scroll_bar_bg_color="black" - mouse_wheel_opaque="false" + mouse_wheel_opaque="true" mouse_opaque="true" background_visible="true" heading_height="23" From 292cbfa6253c2c0b886e578697fa532befd76b11 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 13 Dec 2020 18:11:26 +0100 Subject: [PATCH 16/47] FIRE-30598: Unmaintained skin updates... --- indra/newview/skins/starlightcui/xui/en/floater_preferences.xml | 2 +- indra/newview/skins/vintage/xui/en/floater_preferences.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml index 068240969f..baa8b32b4f 100644 --- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml +++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml @@ -212,7 +212,7 @@ https://accounts.secondlife.com/change_email/ diff --git a/indra/newview/skins/vintage/xui/en/floater_preferences.xml b/indra/newview/skins/vintage/xui/en/floater_preferences.xml index 7824f47c80..53b56ef1ea 100644 --- a/indra/newview/skins/vintage/xui/en/floater_preferences.xml +++ b/indra/newview/skins/vintage/xui/en/floater_preferences.xml @@ -194,7 +194,7 @@ https://accounts.secondlife.com/change_email/ From 5717f384110d8a5c8e9437157b562e598406c93d Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 16 Dec 2020 11:25:15 +0100 Subject: [PATCH 17/47] FIRE-30611: "You" in transcript is underlined --- indra/llui/llurlentry.cpp | 24 ++++++++++++++++++++++++ indra/llui/llurlentry.h | 14 ++++++++++++++ indra/llui/llurlregistry.cpp | 1 + indra/newview/fschathistory.cpp | 13 +++---------- indra/newview/llpanelprofile.cpp | 14 ++++++++++++++ 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 1b158bbead..28c39e2250 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -953,6 +953,30 @@ std::string LLUrlEntryAgentRLVAnonymizedName::getName(const LLAvatarName& avatar } // [/RLVa:KB] +// FIRE-30611: "You" in transcript is underlined +/// +/// FSUrlEntryAgentSelf Describes the agent's Second Life agent Url, e.g., +/// secondlife:///app/agentself/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +FSUrlEntryAgentSelf::FSUrlEntryAgentSelf() : LLUrlEntryAgent() +// +{ + mPattern = boost::regex(APP_HEADER_REGEX "/agentself/[\\da-f-]+/\\w+", + boost::regex::perl|boost::regex::icase); +} + +std::string FSUrlEntryAgentSelf::getLabel(const std::string &url, const LLUrlLabelCallback &cb) +{ + if (LLUI::getInstance()->mSettingGroups["config"]->getBOOL("FSChatHistoryShowYou")) + { + return LLTrans::getString("AgentNameSubst"); + } + else + { + return LLUrlEntryAgent::getLabel(url, cb); + } +} +// + // // LLUrlEntryGroup Describes a Second Life group Url, e.g., // secondlife:///app/group/00005ff3-4044-c79f-9de8-fb28ae0df991/about diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 4e9b7cb066..a3b2f09c4e 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -362,6 +362,20 @@ private: }; // [/RLVa:KB] +// FIRE-30611: "You" in transcript is underlined +/// +/// FSUrlEntryAgentSelf Describes the agent's Second Life agent Url, e.g., +/// secondlife:///app/agentself/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +class FSUrlEntryAgentSelf : public LLUrlEntryAgent +{ +public: + FSUrlEntryAgentSelf(); +private: + /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); +}; +// + + /// /// LLUrlEntryExperienceProfile Describes a Second Life experience profile Url, e.g., /// secondlife:///app/experience/0e346d8b-4433-4d66-a6b0-fd37083abc4c/profile diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 568ac92a4c..aa02f32b90 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -71,6 +71,7 @@ LLUrlRegistry::LLUrlRegistry() // [RLVa:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a registerUrl(new LLUrlEntryAgentRLVAnonymizedName()); // [/RLVa:KB] + registerUrl(new FSUrlEntryAgentSelf());// FIRE-30611: "You" in transcript is underlined // LLUrlEntryAgent*Name must appear before LLUrlEntryAgent since // LLUrlEntryAgent is a less specific (catchall for agent urls) registerUrl(new LLUrlEntryAgent()); diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index 262d0fe1f2..61bcf6b519 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -1505,17 +1505,10 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL } name_params.use_default_link_style = false; - name_params.link_href = LLSLURL("agent", chat.mFromID, "inspect").getSLURLString(); + name_params.link_href = LLSLURL(from_me ? "agentself" : "agent", chat.mFromID, "inspect").getSLURLString(); - if (from_me && gSavedSettings.getBOOL("FSChatHistoryShowYou")) - { - appendText(LLTrans::getString("AgentNameSubst"), prependNewLineState, name_params); - } - else - { - // Add link to avatar's inspector and delimiter to message. - appendText(std::string(name_params.link_href), prependNewLineState, name_params); - } + // Add link to avatar's inspector and delimiter to message. + appendText(std::string(name_params.link_href), prependNewLineState, name_params); prependNewLineState = false; diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index b17b52ccea..345ac191e3 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -213,6 +213,20 @@ public: }; LLAgentHandler gAgentHandler; +// FIRE-30611: "You" in transcript is underlined +class FSAgentSelfHandler : public LLCommandHandler +{ +public: + // requires trusted browser to trigger + FSAgentSelfHandler() : LLCommandHandler("agentself", UNTRUSTED_THROTTLE) { } + + bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) + { + return gAgentHandler.handle(params, query_map, web); + } +}; +FSAgentSelfHandler gAgentSelfHandler; +// //-- LLPanelProfile::ChildStack begins ---------------------------------------- LLPanelProfile::ChildStack::ChildStack() From 103867a468d959e40b2a5a2e9a8aa929cb8627c9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 16 Dec 2020 14:22:58 +0100 Subject: [PATCH 18/47] Fix crashes in send_ObjectGrab_message & send_ObjectDeGrab_message --- indra/newview/lltoolgrab.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index a0513b8c44..99138bbbd5 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -1162,7 +1162,9 @@ LLVector3d LLToolGrabBase::getGrabPointGlobal() void send_ObjectGrab_message(LLViewerObject* object, const LLPickInfo & pick, const LLVector3 &grab_offset) { - if (!object) return; + // Crash fix + //if (!object) return; + if (!object || !object->getRegion()) return; LLMessageSystem *msg = gMessageSystem; @@ -1199,7 +1201,9 @@ void send_ObjectGrab_message(LLViewerObject* object, const LLPickInfo & pick, co void send_ObjectDeGrab_message(LLViewerObject* object, const LLPickInfo & pick) { - if (!object) return; + // Crash fix + //if (!object) return; + if (!object || !object->getRegion()) return; LLMessageSystem *msg = gMessageSystem; From 4f5af772a314213b18a68a2a2594da967c8a2d93 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 16 Dec 2020 14:26:17 +0100 Subject: [PATCH 19/47] Fix crash in writeToRecorders --- indra/llcommon/llerror.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 58d90d46df..59f27c20bf 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1208,7 +1208,9 @@ namespace { LLError::RecorderPtr r = *i; - if (!r->enabled()) + // Crash fix + //if (!r->enabled()) + if (!r || !r->enabled()) { continue; } From 2014962ff8a155eaae2c16355f6fbd64ef62774e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 16 Dec 2020 16:04:39 +0100 Subject: [PATCH 20/47] Properly encode ampersands --- indra/newview/skins/starlightcui/xui/en/floater_preferences.xml | 2 +- indra/newview/skins/vintage/xui/en/floater_preferences.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml index baa8b32b4f..4bcb36ef8a 100644 --- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml +++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml @@ -212,7 +212,7 @@ https://accounts.secondlife.com/change_email/ diff --git a/indra/newview/skins/vintage/xui/en/floater_preferences.xml b/indra/newview/skins/vintage/xui/en/floater_preferences.xml index 53b56ef1ea..fd0a663bdb 100644 --- a/indra/newview/skins/vintage/xui/en/floater_preferences.xml +++ b/indra/newview/skins/vintage/xui/en/floater_preferences.xml @@ -194,7 +194,7 @@ https://accounts.secondlife.com/change_email/ From 040baf9cbe31157ec80b6aee10e7c73d881d4b00 Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 17 Dec 2020 04:51:19 -0800 Subject: [PATCH 21/47] More EEP cleanup of basic shaders being always on --- indra/newview/llfloaterpreference.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7b41808c94..fdcba05c3e 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2513,7 +2513,7 @@ void LLFloaterPreference::disableUnavailableSettings() LLComboBox* ctrl_reflections = getChild("Reflections"); LLCheckBoxCtrl* ctrl_avatar_vp = getChild("AvatarVertexProgram"); LLCheckBoxCtrl* ctrl_avatar_cloth = getChild("AvatarCloth"); - LLCheckBoxCtrl* ctrl_shader_enable = getChild("BasicShaders"); + //LLCheckBoxCtrl* ctrl_shader_enable = getChild("BasicShaders"); // More EEP cleanup of basic shaders being always on LLCheckBoxCtrl* ctrl_wind_light = getChild("WindLightUseAtmosShaders"); LLCheckBoxCtrl* ctrl_deferred = getChild("UseLightShaders"); LLComboBox* ctrl_shadows = getChild("ShadowDetail"); @@ -2521,6 +2521,7 @@ void LLFloaterPreference::disableUnavailableSettings() LLCheckBoxCtrl* ctrl_dof = getChild("UseDoF"); LLSliderCtrl* sky = getChild("SkyMeshDetail"); + /* More EEP cleanup of basic shaders being always on // if vertex shaders off, disable all shader related products if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable")) { @@ -2553,6 +2554,7 @@ void LLFloaterPreference::disableUnavailableSettings() ctrl_deferred->setEnabled(FALSE); ctrl_deferred->setValue(FALSE); } + */ // disabled windlight if (!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders")) From 51cc4534ccf8da356e3561f7458267673ac5f082 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 17 Dec 2020 18:55:54 +0100 Subject: [PATCH 22/47] This can go entirely --- indra/newview/llfloaterpreference.cpp | 36 --------------------------- 1 file changed, 36 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index fdcba05c3e..f7ef007017 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2513,7 +2513,6 @@ void LLFloaterPreference::disableUnavailableSettings() LLComboBox* ctrl_reflections = getChild("Reflections"); LLCheckBoxCtrl* ctrl_avatar_vp = getChild("AvatarVertexProgram"); LLCheckBoxCtrl* ctrl_avatar_cloth = getChild("AvatarCloth"); - //LLCheckBoxCtrl* ctrl_shader_enable = getChild("BasicShaders"); // More EEP cleanup of basic shaders being always on LLCheckBoxCtrl* ctrl_wind_light = getChild("WindLightUseAtmosShaders"); LLCheckBoxCtrl* ctrl_deferred = getChild("UseLightShaders"); LLComboBox* ctrl_shadows = getChild("ShadowDetail"); @@ -2521,41 +2520,6 @@ void LLFloaterPreference::disableUnavailableSettings() LLCheckBoxCtrl* ctrl_dof = getChild("UseDoF"); LLSliderCtrl* sky = getChild("SkyMeshDetail"); - /* More EEP cleanup of basic shaders being always on - // if vertex shaders off, disable all shader related products - if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable")) - { - ctrl_shader_enable->setEnabled(FALSE); - ctrl_shader_enable->setValue(FALSE); - - ctrl_wind_light->setEnabled(FALSE); - ctrl_wind_light->setValue(FALSE); - - sky->setEnabled(FALSE); - - ctrl_reflections->setEnabled(FALSE); - ctrl_reflections->setValue(0); - - ctrl_avatar_vp->setEnabled(FALSE); - ctrl_avatar_vp->setValue(FALSE); - - ctrl_avatar_cloth->setEnabled(FALSE); - ctrl_avatar_cloth->setValue(FALSE); - - ctrl_shadows->setEnabled(FALSE); - ctrl_shadows->setValue(0); - - ctrl_ssao->setEnabled(FALSE); - ctrl_ssao->setValue(FALSE); - - ctrl_dof->setEnabled(FALSE); - ctrl_dof->setValue(FALSE); - - ctrl_deferred->setEnabled(FALSE); - ctrl_deferred->setValue(FALSE); - } - */ - // disabled windlight if (!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders")) { From d0156575c09ff4011a2a446098e2cab91a224e19 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 20 Dec 2020 23:46:51 +0100 Subject: [PATCH 23/47] Updated Polish translation, correcting minor mistake in Italian --- .../xui/it/floater_phototools_camera.xml | 2 +- .../xui/pl/floater_fs_camera_small.xml | 38 +++++++++++++++++++ .../default/xui/pl/panel_preferences_UI.xml | 1 + 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/xui/pl/floater_fs_camera_small.xml diff --git a/indra/newview/skins/default/xui/it/floater_phototools_camera.xml b/indra/newview/skins/default/xui/it/floater_phototools_camera.xml index e40a20f586..296f55b88c 100644 --- a/indra/newview/skins/default/xui/it/floater_phototools_camera.xml +++ b/indra/newview/skins/default/xui/it/floater_phototools_camera.xml @@ -27,7 +27,7 @@ Vista laterale - /> + Vista retro diff --git a/indra/newview/skins/default/xui/pl/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/pl/floater_fs_camera_small.xml new file mode 100644 index 0000000000..edfb94bd9e --- /dev/null +++ b/indra/newview/skins/default/xui/pl/floater_fs_camera_small.xml @@ -0,0 +1,38 @@ + + + + Obróć kamerę wokół punktu skupienia + + + Przybliż kamerę do punktu skupienia + + + Poruszaj kamerą w górę, w dół, w lewo i w prawo + + + Pokaż obiekt + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml index b147a6bf58..82f2e915e5 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml @@ -111,6 +111,7 @@ + Używaj osobnych okien dla: From e4a3fd79bf50a46afc222dbcbf9ec87f9bf81a42 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 21 Dec 2020 17:09:03 +0100 Subject: [PATCH 24/47] FIRE-30628 [EEP] Inventory filter lacks Settings inventory object type in pulldown --- indra/newview/llpanelmaininventory.cpp | 1 + indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml | 1 + indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml | 1 + indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 + indra/newview/skins/default/xui/pl/panel_main_inventory.xml | 1 + indra/newview/skins/starlight/xui/en/panel_main_inventory.xml | 1 + indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml | 1 + indra/newview/skins/vintage/xui/en/panel_main_inventory.xml | 1 + indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml | 1 + 9 files changed, 9 insertions(+) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 3621570aa2..de780f17ac 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -182,6 +182,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p) mFilterMap["filter_type_textures"] = 0x01 << LLInventoryType::IT_TEXTURE; mFilterMap["filter_type_snapshots"] = 0x01 << LLInventoryType::IT_SNAPSHOT; mFilterMap["filter_type_meshes"] = 0x01 << LLInventoryType::IT_MESH; + mFilterMap["filter_type_settings"] = 0x01 << LLInventoryType::IT_SETTINGS; // initialize empty filter mask mFilterMask = 0; diff --git a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml index 0e67c9e937..20cda26f42 100644 --- a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml @@ -522,6 +522,7 @@ + diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml index a68437d9c1..5194cc65b2 100644 --- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml @@ -92,6 +92,7 @@ + diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index e00f5a5062..d6d215a565 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -86,6 +86,7 @@ + diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml index 3b93978f47..9bf6050672 100644 --- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml @@ -30,6 +30,7 @@ + diff --git a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml index 3e9e644e80..102ec44adb 100644 --- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml @@ -75,6 +75,7 @@ + diff --git a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml index cdb2f557f9..13d10bfe31 100644 --- a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml @@ -77,6 +77,7 @@ + diff --git a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml index 87070ce13b..c0c37d2d9f 100644 --- a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml @@ -528,6 +528,7 @@ + diff --git a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml index 4c3c5a64e2..70065a2053 100644 --- a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml @@ -91,6 +91,7 @@ + From dbe10ba130c2358b54f9aff2b1eec747986fd83c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 21 Dec 2020 18:44:37 +0100 Subject: [PATCH 25/47] Update German translation --- indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml | 3 ++- indra/newview/skins/default/xui/de/panel_main_inventory.xml | 3 ++- indra/newview/skins/vintage/xui/de/panel_main_inventory.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml index cda2003bd7..0ce6df3cfe 100644 --- a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml @@ -93,7 +93,8 @@ - + + diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index d8990fe940..e60c1bbef5 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -28,7 +28,8 @@ - + + diff --git a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml index 30d535a2cb..63e5c8e57d 100644 --- a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml @@ -101,7 +101,8 @@ - + + From 9d0576be83239a6db02bab59eaf5953ddf8b856a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 21 Dec 2020 18:48:04 +0100 Subject: [PATCH 26/47] Update FMOD Studio to 2.01.07 on Windows --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4d9638e3f1..136a1a7365 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -992,11 +992,11 @@ archive hash - b88e70667efc230a00d6a2d982af8fc5 + 9e9f303912776014519c18a0205250ee hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.05-windows-202860859.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.07-windows-203561745.tar.bz2 name windows @@ -1006,18 +1006,18 @@ archive hash - 401829b65cac61a2f96179fadf7eb015 + ae336fe814a6867f6449d0401ea7a9e4 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.05-windows64-202860900.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.07-windows64-203561747.tar.bz2 name windows64 version - 2.01.05 + 2.01.07 fontconfig From 4827a78c15d14bde759929d1a5953485c297e696 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Tue, 22 Dec 2020 00:55:14 +0100 Subject: [PATCH 27/47] FIRE-30624 French translation update --- .../default/xui/fr/floater_model_preview.xml | 152 +++++++++++++----- 1 file changed, 113 insertions(+), 39 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index e4bbf31e4b..0103aaea5e 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml @@ -235,7 +235,6 @@ Échelle (1 = aucune) : - Dimensions : @@ -243,38 +242,140 @@ [X] X [Y] X [Z] - - Modèles d'avatar uniquement : - + + Décalage Z (élever/abaisser l'avatar) : - + + Trop d'articulations texturées + + + Le modèle a des articulations inconnues + + + Articulations : + + + [CONFLICTS] Conflits dans la/les articulations [JOINTS_COUNT] + + + Position annulée pour l'articulation '[JOINT]': + + + + + + + + + + + + + + Chargement des modèles : + + + + + Couleurs de l'aperçu des modèles : + + + Général : + + + + + Physiques : + + + + + Pb des physiques : + + + diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 7c9d72e37c..26c5d3fb04 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -5478,4 +5478,10 @@ Falls Sie diesen Nutzungsbestimmungen nicht zustimmen, sollten keinerlei finanzi HiDPI kann negative Effekte aufweisen und die Leistung beeinträchtigen. + + Dieses Inventar kann nicht erstellt werden: [NAME] + + + Mehrfach-Import von Windlight abgeschlossen. + diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 5fb7fd7a67..fe60ca8beb 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -7144,4 +7144,7 @@ Ihre aktuelle Position: [AVATAR_POS] [COST] L$ + + Importiere Windlight... + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 06fafea440..7cac5d78f8 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1113,7 +1113,35 @@ function="RLV.EnableIfNot" parameter="setenv" /> - + + + + + + + + + + + + + + + Koszty fizyki diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index e4f06f1a96..947dd30567 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -114,6 +114,11 @@ + + + + +