From a38df4c9b1a749e9ec056420df91695338ebf2cf Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 30 May 2020 01:34:59 +0200 Subject: [PATCH 01/16] Update dullahan to latest version. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 10cf890def..3ba6e961db 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ archive hash - b92c2efe8e3802a26209a4ebe2f840ba + 05bdafd8e9f32fc6763862ada4b5c4bc url - http://downloads.phoenixviewer.com/dullahan-1.6.4.202005241618_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201451417.tar.bz2 + http://downloads.phoenixviewer.com/dullahan-1.7.0.202005300110_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201502309.tar.bz2 name linux64 From 4f634176dc4800e39c73ebcf7a2e31bab37ef40f Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 30 May 2020 01:36:09 +0200 Subject: [PATCH 02/16] Add .tar.bz2 to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5a1ac105cb..69b2bb9478 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.pyc *.rej *.swp +*.tar.bz2 *~ # Specific paths and/or names From 545b62b2d5e54bb96564b665adb39fc50cc3f366 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 31 May 2020 03:07:10 +0200 Subject: [PATCH 03/16] Update dullahan (gcc5 version) to latest version. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3ba6e961db..0ca1a1b966 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -52,9 +52,9 @@ archive hash - 68f6096e055e7a0e46913e1c2613b9db + 7725e9abe4bf84d11bc7286c74467026 url - http://downloads.phoenixviewer.com/dullahan_gcc5-1.1.1320_3.3626.1895.g7001d56-linux64-191221945.tar.bz2 + http://downloads.phoenixviewer.com/dullahan_gcc5-1.7.0.202005301906_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201511706.tar.bz2 name linux64 From 2603595f6d99c1d6ed9868b979e0e23fff2efbce Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Sun, 31 May 2020 05:44:56 +0200 Subject: [PATCH 04/16] Windows; update dullahan to latest version. --- autobuild.xml | 8 ++++---- indra/media_plugins/cef/media_plugin_cef.cpp | 8 +++++++- indra/newview/viewer_manifest.py | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 0ca1a1b966..deffea3ec5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - 71fa66203326aca918796e874976c080 + 43c03679c3847754b407532efe5d4392 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2 + http://downloads.phoenixviewer.com/dullahan-1.7.0.202005292352_81.3.10_gb223419_chromium-81.0.4044.138-windows-201512310.tar.bz2 name windows @@ -862,9 +862,9 @@ archive hash - c7162e4805f50a3609f5dc63d0cf2bc0 + 13574736220c05de847980f851f42827 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2 + http://downloads.phoenixviewer.com/dullahan-1.7.0.202005292352_81.3.10_gb223419_chromium-81.0.4044.138-windows64-201512301.tar.bz2 name windows64 diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 900fe7974b..ee8f72daf1 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -516,7 +516,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.flip_mouse_y = false; settings.flip_pixels_y = true; settings.frame_rate = 60; - settings.force_wave_audio = true; + + // With the latest CEF this does more worse than good. It will allow the viewer to control the audio level (apparently); But it will also break a lot of sites (among then twitch, netflix, spotify). + // Right now with the choice between lots of broken sites or volumes for me it's rather the sites being usable. + // settings.force_wave_audio = true; + settings.force_wave_audio = false; + // + settings.initial_height = 1024; settings.initial_width = 1024; settings.java_enabled = false; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 73d182862c..3294b9e1bf 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -690,13 +690,13 @@ class WindowsManifest(ViewerManifest): config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' with self.prefix(src=os.path.join(pkgdir, 'bin', config)): self.path("chrome_elf.dll") - self.path("d3dcompiler_43.dll") + self.fs_try_path("d3dcompiler_43.dll") # d3dcompiler_43.dll was removed in the latest cef versions self.path("d3dcompiler_47.dll") self.path("libcef.dll") self.path("libEGL.dll") self.path("libGLESv2.dll") self.path("dullahan_host.exe") - self.path("natives_blob.bin") + self.fs_try_path("natives_blob.bin") # natives_blob.bin was removed in the latest cef versions self.path("snapshot_blob.bin") self.path("v8_context_snapshot.bin") From 2f60c03639be50a49cb47cbc2dbc175531a5cadf Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 31 May 2020 15:55:06 +0200 Subject: [PATCH 05/16] Fixed few minor oversights in /en/ files found during initial Polish translation... --- .../skins/default/xui/en/panel_region_environment.xml | 2 +- indra/newview/skins/default/xui/en/strings.xml | 11 ----------- .../skins/default/xui/en/widgets/density_ctrl.xml | 5 +++++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index d42f8ca157..33e333d7ad 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -13,7 +13,7 @@ Use Region Settings Sky [INDEX]([ALTITUDE]m) No parcel is selected. Environmental settings are disabled. - Environmental settings are not available across region boundries. + Environmental settings are not available across region boundaries. Environmental settings are not available on this region. The estate manager does not allow changing parcel environments in this region. The parcel must be at least 128 square meters to support an environment. diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5380fb6335..a4c4f02555 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -372,17 +372,6 @@ Only items with unrestricted "can be attached to notecards. - - -Items of this type can't be attached -to notecards on this region. - - -Only items with unrestricted -'next owner' permissions -can be attached to notecards. - - Searching... None found. diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml index 0f3f0159db..eb665fd3cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml +++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml @@ -13,6 +13,7 @@ follows="left|top" height="11" layout="topleft" + name="exponential_term_label" left="15" top_pad="-5" width="120"> @@ -45,6 +46,7 @@ Exponential Term follows="left|top" height="11" layout="topleft" + name="exponential_scale_factor_label" left="15" top_pad="-5" width="120"> @@ -69,6 +71,7 @@ Exponential Scale Factor follows="left|top" height="11" layout="topleft" + name="linear_term_label" left="15" top_pad="-5" width="120"> @@ -93,6 +96,7 @@ Linear Term follows="left|top" height="11" layout="topleft" + name="constant_term_label" left="15" top_pad="-5" width="120"> @@ -117,6 +121,7 @@ Constant Term follows="left|top" height="11" layout="topleft" + name="max_altitude_label" left="15" top_pad="15" width="80"> From ae38de88716137848f011a289f026236dd4ce611 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 31 May 2020 15:58:22 +0200 Subject: [PATCH 06/16] Actually, that quotation mark is unnecessary there --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a4c4f02555..90e91d3c8b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -369,7 +369,7 @@ to notecards on this region. Only items with unrestricted 'next owner' permissions -"can be attached to notecards. +can be attached to notecards. From 21809adba021ffdfef34ec5d39ae63bfb978f51a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 1 Jun 2020 16:31:27 +0200 Subject: [PATCH 07/16] FIRE-29649: Crash when opening spellcheck settings --- indra/llui/llspellcheck.cpp | 10 +++++++++- indra/llui/llspellcheck.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/indra/llui/llspellcheck.cpp b/indra/llui/llspellcheck.cpp index 990e651853..63a86fc0b2 100644 --- a/indra/llui/llspellcheck.cpp +++ b/indra/llui/llspellcheck.cpp @@ -50,7 +50,7 @@ LLSpellChecker::LLSpellChecker() : mHunspell(NULL) { // Load initial dictionary information - refreshDictionaryMap(); + //refreshDictionaryMap(); // FIRE-29649: Crash when opening spellcheck settings } LLSpellChecker::~LLSpellChecker() @@ -58,6 +58,14 @@ LLSpellChecker::~LLSpellChecker() delete mHunspell; } +// FIRE-29649: Crash when opening spellcheck settings +void LLSpellChecker::initSingleton() +{ + // Load initial dictionary information + refreshDictionaryMap(); +} +// + bool LLSpellChecker::checkSpelling(const std::string& word) const { if ( (!mHunspell) || (word.length() < 3) || (0 != mHunspell->spell(word.c_str())) ) diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h index f1964cc091..36628780a3 100644 --- a/indra/llui/llspellcheck.h +++ b/indra/llui/llspellcheck.h @@ -47,6 +47,7 @@ public: protected: void addToDictFile(const std::string& dict_path, const std::string& word); void initHunspell(const std::string& dict_language); + void initSingleton(); // FIRE-29649: Crash when opening spellcheck settings public: typedef std::list dict_list_t; From 17e39d3fd9ef508a51d169ab73ae64c09cc98fac Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 1 Jun 2020 16:55:06 +0200 Subject: [PATCH 08/16] FIRE-29642: Show 0m as distance for HUD attachments in area search --- indra/newview/fsareasearch.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index 1a7e65633f..065ced1660 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -81,6 +81,18 @@ const F32 MIN_DISTANCE_MOVED = 1.0f; const F32 REQUEST_TIMEOUT = 30.0f; +F32 calculateObjectDistance(LLVector3d agent_pos, LLViewerObject* object) +{ + if (object->isHUDAttachment()) + { + return 0.f; + } + else + { + return dist_vec(agent_pos, object->getPositionGlobal()); + } +} + class FSAreaSearch::FSParcelChangeObserver : public LLParcelObserver { public: @@ -624,8 +636,8 @@ void FSAreaSearch::requestObjectProperties(const std::vector& request_list, msg->newMessageFast(_PREHASH_ObjectDeselect); } msg->nextBlockFast(_PREHASH_AgentData); - msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); - msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + msg->addUUIDFast(_PREHASH_AgentID, gAgentID); + msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID); select_count++; start_new_message = false; } @@ -777,7 +789,7 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje if (mFilterDistance) { - S32 distance = dist_vec(mPanelList->getAgentLastPosition(), objectp->getPositionGlobal());// used mAgentLastPosition instead of gAgent->getPositionGlobal for performace + S32 distance = (S32)calculateObjectDistance(mPanelList->getAgentLastPosition(), objectp);// used mAgentLastPosition instead of gAgent->getPositionGlobal for performace if (!(distance >= mFilterDistanceMin && distance <= mFilterDistanceMax)) { return; @@ -989,7 +1001,7 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje row_params.value = object_id.asString(); cell_params.column = "distance"; - cell_params.value = llformat("%1.0f m", dist_vec(mPanelList->getAgentLastPosition(), objectp->getPositionGlobal())); // used mAgentLastPosition instead of gAgent->getPositionGlobal for performace + cell_params.value = llformat("%1.0f m", calculateObjectDistance(mPanelList->getAgentLastPosition(), objectp)); // used mAgentLastPosition instead of gAgent->getPositionGlobal for performace row_params.columns.add(cell_params); cell_params.column = "name"; @@ -1471,7 +1483,7 @@ void FSPanelAreaSearchList::updateScrollList() { if (agent_moved && distance_column) { - item->getColumn(distance_column->mIndex)->setValue(LLSD(llformat("%1.0f m", dist_vec(current_agent_position, objectp->getPositionGlobal())))); + item->getColumn(distance_column->mIndex)->setValue(LLSD(llformat("%1.0f m", calculateObjectDistance(current_agent_position, objectp)))); } } } @@ -1614,7 +1626,7 @@ bool FSPanelAreaSearchList::onContextMenuItemEnable(const LLSD& userdata) { LLUUID object_id = mResultList->getFirstSelected()->getUUID(); LLViewerObject* objectp = gObjectList.findObject(object_id); - return (objectp && dist_vec_squared(gAgent.getPositionGlobal(), objectp->getPositionGlobal()) < gAgentCamera.mDrawDistance * gAgentCamera.mDrawDistance); + return (objectp && calculateObjectDistance(gAgent.getPositionGlobal(), objectp) < gAgentCamera.mDrawDistance); } else { @@ -1978,8 +1990,8 @@ void FSPanelAreaSearchList::sitOnObject(FSObjectProperties& details, LLViewerObj { gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit); gMessageSystem->nextBlockFast(_PREHASH_AgentData); - gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); - gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID); + gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID); gMessageSystem->nextBlockFast(_PREHASH_TargetObject); gMessageSystem->addUUIDFast(_PREHASH_TargetID, objectp->mID); gMessageSystem->addVector3Fast(_PREHASH_Offset, LLVector3::zero); From 1af3bd238ced7b4183c43dae94982190706ec3d3 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 1 Jun 2020 16:57:56 +0200 Subject: [PATCH 09/16] Fix cut-off labels on area search floater --- indra/newview/skins/default/xui/en/floater_fs_area_search.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/skins/default/xui/en/floater_fs_area_search.xml b/indra/newview/skins/default/xui/en/floater_fs_area_search.xml index 4c67afe116..722ea7d415 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_area_search.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_area_search.xml @@ -308,6 +308,7 @@ name="only_list" height="15" follows="top|left" + right="-5" left="5"> Only list objects that are: @@ -541,6 +542,7 @@ height="15" top_pad="5" follows="top|left" + right="-5" left="5"> Exclude objects that are: From 433e14e5c44ceaf9c909e531a437a05ab5a1968a Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 1 Jun 2020 17:50:39 +0200 Subject: [PATCH 10/16] Updated Polish translation (EEP) --- .../ansastorm/xui/pl/panel_main_inventory.xml | 5 + .../default/xui/pl/floater_about_land.xml | 1 + .../xui/pl/floater_adjust_environment.xml | 74 +++++++++ .../skins/default/xui/pl/floater_beacons.xml | 5 + .../default/xui/pl/floater_beamshape.xml | 1 + .../default/xui/pl/floater_bulk_perms.xml | 1 + .../skins/default/xui/pl/floater_camera.xml | 34 ++-- .../default/xui/pl/floater_camera_presets.xml | 2 + .../default/xui/pl/floater_edit_day_cycle.xml | 65 -------- .../xui/pl/floater_edit_ext_day_cycle.xml | 79 +++++++++ .../xui/pl/floater_edit_hover_height.xml | 1 + .../xui/pl/floater_edit_sky_preset.xml | 109 ------------- .../xui/pl/floater_edit_water_preset.xml | 72 --------- .../xui/pl/floater_environment_settings.xml | 37 ----- .../xui/pl/floater_fixedenvironment.xml | 28 ++++ .../xui/pl/floater_inventory_view_finder.xml | 1 + .../xui/pl/floater_load_pref_preset.xml | 2 +- .../xui/pl/floater_my_environments.xml | 22 +++ .../default/xui/pl/floater_perms_default.xml | 3 + .../default/xui/pl/floater_phototools.xml | 8 +- .../xui/pl/floater_phototools_camera.xml | 8 + .../default/xui/pl/floater_pick_track.xml | 21 +++ .../floater_preferences_graphics_advanced.xml | 3 +- .../pl/floater_preferences_view_advanced.xml | 14 ++ .../default/xui/pl/floater_quickprefs.xml | 4 +- .../xui/pl/floater_save_camera_preset.xml | 15 ++ .../xui/pl/floater_save_pref_preset.xml | 8 +- .../xui/pl/floater_settings_picker.xml | 29 ++++ .../skins/default/xui/pl/menu_inventory.xml | 8 + .../default/xui/pl/menu_inventory_add.xml | 5 + .../default/xui/pl/menu_save_settings.xml | 9 ++ .../default/xui/pl/menu_settings_add.xml | 6 + .../default/xui/pl/menu_settings_gear.xml | 10 ++ .../skins/default/xui/pl/menu_viewer.xml | 21 +-- .../skins/default/xui/pl/notifications.xml | 107 +++++++++++- .../xui/pl/panel_camera_preset_item.xml | 6 + .../default/xui/pl/panel_navigation_bar.xml | 6 +- .../xui/pl/panel_preferences_colors.xml | 1 + .../xui/pl/panel_preferences_crashreports.xml | 9 +- .../default/xui/pl/panel_preferences_move.xml | 1 - .../xui/pl/panel_presets_camera_pulldown.xml | 7 + .../xui/pl/panel_region_environment.xml | 153 ++++++++++++++---- .../xui/pl/panel_settings_sky_atmos.xml | 51 ++++++ .../xui/pl/panel_settings_sky_clouds.xml | 34 ++++ .../xui/pl/panel_settings_sky_density.xml | 27 ++++ .../xui/pl/panel_settings_sky_sunmoon.xml | 54 +++++++ .../default/xui/pl/panel_settings_water.xml | 57 +++++++ .../skins/default/xui/pl/role_actions.xml | 1 + .../newview/skins/default/xui/pl/strings.xml | 98 ++++++++++- .../default/xui/pl/widgets/density_ctrl.xml | 21 +++ .../latency/xui/pl/floater_about_land.xml | 1 + .../starlight/xui/pl/panel_navigation_bar.xml | 2 +- .../starlightcui/xui/pl/floater_camera.xml | 75 --------- .../xui/pl/panel_navigation_bar.xml | 2 +- .../vintage/xui/pl/floater_about_land.xml | 1 + .../vintage/xui/pl/panel_main_inventory.xml | 5 + 56 files changed, 984 insertions(+), 446 deletions(-) create mode 100644 indra/newview/skins/default/xui/pl/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_camera_presets.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_edit_ext_day_cycle.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_edit_sky_preset.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_edit_water_preset.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_environment_settings.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_my_environments.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_save_camera_preset.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_settings_picker.xml create mode 100644 indra/newview/skins/default/xui/pl/menu_save_settings.xml create mode 100644 indra/newview/skins/default/xui/pl/menu_settings_add.xml create mode 100644 indra/newview/skins/default/xui/pl/menu_settings_gear.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_camera_preset_item.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_presets_camera_pulldown.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_sky_density.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_water.xml create mode 100644 indra/newview/skins/default/xui/pl/widgets/density_ctrl.xml delete mode 100644 indra/newview/skins/starlightcui/xui/pl/floater_camera.xml 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 08621cdaf9..56b358453e 100644 --- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml @@ -51,6 +51,11 @@ + + + + + diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index c92019b84b..46dbd31599 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -452,5 +452,6 @@ teksturę: + diff --git a/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml b/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml new file mode 100644 index 0000000000..5966ca63c9 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml @@ -0,0 +1,74 @@ + + + + + + + + Otoczenie: + + + Hor. błękitu: + + + Gęst. błękitu: + + + + + + + @@ -114,6 +120,8 @@ + + diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml index e5f3c2710a..1e228cc987 100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml @@ -33,4 +33,9 @@ + + + + + diff --git a/indra/newview/skins/default/xui/pl/menu_save_settings.xml b/indra/newview/skins/default/xui/pl/menu_save_settings.xml new file mode 100644 index 0000000000..918fc75184 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/menu_save_settings.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/indra/newview/skins/default/xui/pl/menu_settings_add.xml b/indra/newview/skins/default/xui/pl/menu_settings_add.xml new file mode 100644 index 0000000000..6cb3a68898 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/menu_settings_add.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/indra/newview/skins/default/xui/pl/menu_settings_gear.xml b/indra/newview/skins/default/xui/pl/menu_settings_gear.xml new file mode 100644 index 0000000000..a002d3c236 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/menu_settings_gear.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index fd4ad6dbd0..0c2a800e62 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -105,31 +105,31 @@ - + - + + + + - - + @@ -463,6 +463,9 @@ + + + @@ -488,7 +491,7 @@ - + diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index d1e3f32ad2..5d49484e6c 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -1989,6 +1989,11 @@ Kontynuować? Odznaczenie tej opcji może usunąć ograniczenia nadane przez właścicieli działek w celu zapobiegania dokuczaniu, zachowaniu prywatności lub aby chronić nieletnich przed materiałami dla dorosłych. Porozmawiaj z właścicielami działek, jeśli to konieczne. + + (Zmiana w całym majątku: [ESTATENAME]) Odznaczenie tej opcji spowoduje usunięcie wszelkich niestandardowych otoczeń, które zostały dodane do działek przez ich właścicieli. Przedyskutuj zmianę z właścicielami działek w razie potrzeby. +Czy chcesz kontynuować? + + Na pewno chcesz zmienić treść umowy dla tego majątku? @@ -2454,7 +2459,15 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t Ten plik cyklu dziennego używa brakującego pliku nieba: [SKY]. - Ustawienia nie mogą zostać zastosowane w regionie. Opuszczenie regionu, a następnie powrócenie do niego może naprawić problem. Powód: [FAIL_REASON] + Ustawienia nie mogą zostać zastosowane w regionie. Powód: [FAIL_REASON] + + + Lokalna tekstura jest używana na ścieżce [TRACK], klatce #[FRAMENO] ([FRAME]%) w polu [FIELD]. +Otoczenia nie mogą zostać zapisane gdy lokalne tekstury są w użyciu. + + + Lokalna tekstura jest używana w polu [FIELD]. +Otoczenia nie mogą zostać zapisane gdy lokalne tekstury są w użyciu. Nie można usunąć ostatniego klucza w cyklu dnia, bo nie może on być pusty. Zmodyfikuj ten klucz zamiast go usuwać, a potem dodaj nowy. @@ -3394,6 +3407,10 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa. Nie można zastąpić domyślnego ustawienia. + + '[NAME]' jest w użyciu. Możesz zastąpić +to ustawienie lub wybrać inną nazwę. + Błąd podczas usuwania ustawienia [NAME]. @@ -4963,4 +4980,92 @@ Jeśli nie zgadzasz się z niniejszymi warunkami użytkowania, nie należy przep Włączenie obsługi HiDPI może mieć niekorzystne skutki i pogorszyć wydajność. + + + + + + + + + + + + + + Nie można załadować ustawień dla [NAME] z bazy danych. + + + Nie można zastosować tych ustawień do otoczenia. + + + Nie można zastosować tych ustawień do otoczenia. + + + Ten region nie obsługuje ustawień otoczenia. + + + Zapisz bieżące ustawienia otoczenia jako: +
+ + [DESC] (nowe) + +
+ + + + + From df14857200d23c9ef68e30ec54aa19b47ddb0419 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 1 Jun 2020 18:37:15 +0200 Subject: [PATCH 11/16] Update German translation --- .../skins/default/xui/de/floater_save_pref_preset.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml index 8acb33cedf..7fa7400495 100644 --- a/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml @@ -1,11 +1,5 @@ - - Grafikvoreinstellung speichern - - - Kameravoreinstellung speichern - Geben Sie einen Namen für die Voreinstellung ein oder wählen Sie eine vorhandene Voreinstellung aus. From 9697c5ba3f3763733b69e65184f745776f7cf58f Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 1 Jun 2020 22:49:41 +0100 Subject: [PATCH 12/16] OpenSim - Crash in transaction completion (via bugsplat) --- indra/newview/llxmlrpctransaction.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index e18b42d025..da84f93d7d 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -265,6 +265,22 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle, // the contents of a buffer array are potentially noncontiguous, so we // will need to copy them into an contiguous block of memory for XMLRPC. LLCore::BufferArray *body = response->getBody(); + + // crash in transaction completion (see bugsplat https://app.bugsplat.com/v2/keycrash?database=fs_windows&stackKeyId=13) + if(body == nullptr) + { + // status should be 0 but log it anyway + // everything past this point appears to depend on the body data + // so log the issues and return. + LL_WARNS() + << "LLXMLRPCTransaction response has no body. status=" + << status.toHex() << ": " << status.toString() << LL_ENDL; + LL_WARNS() + << "LLXMLRPCTransaction request URI: " + << mImpl->mURI << LL_ENDL; + return; + } + // char * bodydata = new char[body->size()]; body->read(0, bodydata, body->size()); @@ -302,8 +318,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle, << faultString << LL_ENDL; LL_WARNS() << "LLXMLRPCTransaction request URI: " << mImpl->mURI << LL_ENDL; - } - + } } //========================================================================= From 6e118b842d073268d9f11a346580aa84ecf8b885 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 2 Jun 2020 00:16:44 +0200 Subject: [PATCH 13/16] Fix search floater race condition screwing up layout when switching tabs before search results arrive --- indra/newview/fsfloatersearch.cpp | 107 +++++++++++++++--------------- indra/newview/fsfloatersearch.h | 4 +- 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp index 630cc48162..187b49bd42 100644 --- a/indra/newview/fsfloatersearch.cpp +++ b/indra/newview/fsfloatersearch.cpp @@ -242,7 +242,7 @@ FSFloaterSearch::~FSFloaterSearch() { delete mRemoteParcelObserver; delete mAvatarPropertiesObserver; - gGenericDispatcher.addHandler("classifiedclickthrough", NULL); + gGenericDispatcher.addHandler("classifiedclickthrough", nullptr); } // virtual @@ -314,17 +314,13 @@ BOOL FSFloaterSearch::postBuild() mDetailSnapshot = getChild("snapshot"); mDetailMaturity = getChild("maturity_icon"); mTabContainer = getChild("ls_tabs"); - if (mTabContainer) - { - mTabContainer->setCommitCallback(boost::bind(&FSFloaterSearch::onTabChange, this)); - } + mTabContainer->setCommitCallback(boost::bind(&FSFloaterSearch::onTabChange, this)); + flushDetails(); - if (mDetailsPanel) - { - mDetailsPanel->setVisible(false); - } + mDetailsPanel->setVisible(false); + mHasSelection = false; if (!mTabContainer->selectTab(gSavedSettings.getS32("FSLastSearchTab"))) @@ -344,7 +340,7 @@ void FSFloaterSearch::onTabChange() mDetailsPanel->setVisible(false); mPanelWeb->resetFocusOnLoad(); } - // If on legacy preople search and skin uses full profile preview, hide preview panel + // If on legacy people search and skin uses full profile preview, hide preview panel else if (active_panel == mPanelPeople && mPanelProfile) { mDetailsPanel->setVisible(false); @@ -356,16 +352,17 @@ void FSFloaterSearch::onTabChange() } //static -LLPanel* FSFloaterSearch::getSearchPanel(std::string panel_name) +template +T* FSFloaterSearch::getSearchPanel(const std::string& panel_name) { - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance && search_instance->mTabContainer) { - return search_instance->mTabContainer->getPanelByName(panel_name); + return dynamic_cast(search_instance->mTabContainer->getPanelByName(panel_name)); } else { - return NULL; + return nullptr; } } @@ -452,7 +449,7 @@ void FSFloaterSearch::displayParcelDetails(const LLParcelData& parcel_data) map["LOCATION"] = llformat("%s (%d, %d, %d)", parcel_data.sim_name.c_str(), region_x, region_y, region_z); mParcelGlobal = LLVector3d(parcel_data.global_x, parcel_data.global_y, parcel_data.global_z); - mDetailsPanel->setVisible(true); + mDetailsPanel->setVisible(mTabContainer->getCurrentPanel()->getName() == "panel_ls_places" || mTabContainer->getCurrentPanel()->getName() == "panel_ls_land"); mHasSelection = true; mDetailMaturity->setVisible(true); mDetailTitle->setValue(parcel_data.name); @@ -478,7 +475,7 @@ void FSFloaterSearch::displayAvatarDetails(LLAvatarData*& avatar_data) mDetailAux2->setValue(getString("string.partner", map)); } - mDetailsPanel->setVisible(true); + mDetailsPanel->setVisible(mTabContainer->getCurrentPanel()->getName() == "panel_ls_people"); mHasSelection = true; mDetailTitle->setValue(LLTrans::getString("LoadingData")); mDetailDesc->setValue(avatar_data->about_text); @@ -500,7 +497,7 @@ void FSFloaterSearch::displayGroupDetails(LLGroupMgrGroupData*& group_data) map["MEMBER_COUNT"] = llformat("%d",group_data->mMemberCount); map["FOUNDER"] = LLSLURL("agent", group_data->mFounderID, "inspect").getSLURLString(); - mDetailsPanel->setVisible(true); + mDetailsPanel->setVisible(mTabContainer->getCurrentPanel()->getName() == "panel_ls_groups"); mHasSelection = true; mDetailTitle->setValue(LLTrans::getString("LoadingData")); mDetailDesc->setValue(group_data->mCharter); @@ -536,7 +533,7 @@ void FSFloaterSearch::displayClassifiedDetails(LLAvatarClassifiedInfo*& c_info) map["LISTING_PRICE"] = llformat("L$%d", c_info->price_for_listing); map["SLURL"] = LLSLURL("parcel", c_info->parcel_id, "about").getSLURLString(); - mDetailsPanel->setVisible(true); + mDetailsPanel->setVisible(mTabContainer->getCurrentPanel()->getName() == "panel_ls_groupspanel_ls_classifieds"); mHasSelection = true; mDetailMaturity->setVisible(true); mParcelGlobal = c_info->pos_global; @@ -583,7 +580,7 @@ void FSFloaterSearch::displayEventDetails(U32 eventId, F64 eventEpoch, const std mParcelGlobal = eventGlobalPos; mEventID = eventId; - mDetailsPanel->setVisible(true); + mDetailsPanel->setVisible(mTabContainer->getCurrentPanel()->getName() == "panel_ls_events"); mHasSelection = true; mDetailMaturity->setVisible(true); mDetailTitle->setValue(eventName); @@ -728,7 +725,7 @@ void FSFloaterSearch::onBtnEventReminder() static LLPanelInjector t_panel_fs_search_people("panel_ls_people"); FSPanelSearchPeople::FSPanelSearchPeople() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mStartSearch(0) , mResultsReceived(0) , mResultsContent() @@ -863,9 +860,11 @@ void FSPanelSearchPeople::onSelectItem() { return; } - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) + { search_instance->FSFloaterSearch::onSelectedItem(mSearchResults->getSelectedValue(), FSFloaterSearch::SC_AVATAR); + } } // static @@ -886,10 +885,10 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received search results - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchPeople* self = (FSPanelSearchPeople*)FSFloaterSearch::getSearchPanel("panel_ls_people"); + FSPanelSearchPeople* self = FSFloaterSearch::getSearchPanel("panel_ls_people"); // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->getQueryID()) + if (!self || query_id != self->getQueryID()) { return; } @@ -914,7 +913,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**) search_results->setCommentText(LLTrans::getString("not_found", map)); return; } - else if(status & STATUS_SEARCH_PLACES_SHORTSTRING) + else if (status & STATUS_SEARCH_PLACES_SHORTSTRING) { search_results->setEnabled(FALSE); search_results->setCommentText(LLTrans::getString("search_short")); @@ -956,7 +955,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**) if (agent_id.isNull()) { - LL_INFOS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; + LL_INFOS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("people_edit")->getValue().asString(); search_results->setEnabled(FALSE); @@ -1004,7 +1003,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_groups("panel_ls_groups"); FSPanelSearchGroups::FSPanelSearchGroups() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mStartSearch(0) , mResultsReceived(0) , mResultsContent() @@ -1114,7 +1113,7 @@ void FSPanelSearchGroups::find() void FSPanelSearchGroups::onBtnFind() { std::string text = mSearchComboBox->getSimple(); - if(!text.empty()) + if (!text.empty()) { LLSearchHistory::getInstance()->addEntry(text); } @@ -1164,7 +1163,7 @@ void FSPanelSearchGroups::onSelectItem() { return; } - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) { search_instance->FSFloaterSearch::onSelectedItem(mSearchResults->getSelectedValue(), FSFloaterSearch::SC_GROUP); @@ -1191,10 +1190,10 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received directory request - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchGroups* self = (FSPanelSearchGroups*)FSFloaterSearch::getSearchPanel("panel_ls_groups"); + FSPanelSearchGroups* self = FSFloaterSearch::getSearchPanel("panel_ls_groups"); // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->mQueryID) + if (!self || query_id != self->mQueryID) { return; } @@ -1312,7 +1311,7 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_places("panel_ls_places"); FSPanelSearchPlaces::FSPanelSearchPlaces() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mStartSearch(0) , mResultsReceived(0) , mResultsContent() @@ -1496,7 +1495,7 @@ void FSPanelSearchPlaces::onSelectItem() { return; } - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) { search_instance->FSFloaterSearch::onSelectedItem(mSearchResults->getSelectedValue(), FSFloaterSearch::SC_PLACE); @@ -1524,10 +1523,10 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received directory request - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchPlaces* self = (FSPanelSearchPlaces*)FSFloaterSearch::getSearchPanel("panel_ls_places"); + FSPanelSearchPlaces* self = FSFloaterSearch::getSearchPanel("panel_ls_places"); // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->getQueryID()) + if (!self || query_id != self->getQueryID()) { return; } @@ -1601,7 +1600,7 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**) msg->getF32( "QueryReplies", "Dwell", dwell, i); if (parcel_id.isNull()) { - LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("places_edit")->getValue().asString(); search_results->setEnabled(FALSE); @@ -1665,7 +1664,7 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_land("panel_ls_land"); FSPanelSearchLand::FSPanelSearchLand() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mStartSearch(0) , mResultsReceived(0) , mResultsContent() @@ -1875,7 +1874,7 @@ void FSPanelSearchLand::onSelectItem() { return; } - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) { search_instance->FSFloaterSearch::onSelectedItem(mSearchResults->getSelectedValue(), FSFloaterSearch::SC_PLACE); @@ -1906,10 +1905,10 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received directory request - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchLand* self = (FSPanelSearchLand*)FSFloaterSearch::getSearchPanel("panel_ls_land"); + FSPanelSearchLand* self = FSFloaterSearch::getSearchPanel("panel_ls_land"); // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->mQueryID) + if (!self || query_id != self->mQueryID) { return; } @@ -1948,7 +1947,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**) msg->getS32( "QueryReplies", "ActualArea", area, i); if (parcel_id.isNull()) { - LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; search_results->setEnabled(FALSE); search_results->setCommentText(LLTrans::getString("no_results")); } @@ -1957,7 +1956,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**) LL_DEBUGS("Search") << "Got: " << name << " ClassifiedID: " << parcel_id << LL_ENDL; search_results->setEnabled(TRUE); found_one = true; - if ( msg->getSizeFast(_PREHASH_QueryReplies, i, _PREHASH_ProductSKU) > 0 ) + if (msg->getSizeFast(_PREHASH_QueryReplies, i, _PREHASH_ProductSKU) > 0) { msg->getStringFast( _PREHASH_QueryReplies, _PREHASH_ProductSKU, land_sku, i); land_type = LLProductInfoRequestManager::instance().getDescriptionForSku(land_sku); @@ -2064,7 +2063,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_classifieds("panel_ls_classifieds"); FSPanelSearchClassifieds::FSPanelSearchClassifieds() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mStartSearch(0) , mResultsReceived(0) , mResultsContent() @@ -2173,7 +2172,7 @@ void FSPanelSearchClassifieds::find() void FSPanelSearchClassifieds::onBtnFind() { std::string text = mSearchComboBox->getSimple(); - if(!text.empty()) + if (!text.empty()) { LLSearchHistory::getInstance()->addEntry(text); } @@ -2223,7 +2222,7 @@ void FSPanelSearchClassifieds::onSelectItem() { return; } - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) { search_instance->FSFloaterSearch::onSelectedItem(mSearchResults->getSelectedValue(), FSFloaterSearch::SC_CLASSIFIED); @@ -2251,7 +2250,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received directory request - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchClassifieds* self = (FSPanelSearchClassifieds*)FSFloaterSearch::getSearchPanel("panel_ls_classifieds"); + FSPanelSearchClassifieds* self = FSFloaterSearch::getSearchPanel("panel_ls_classifieds"); if (msg->getNumberOfBlocks("StatusData")) { @@ -2264,7 +2263,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**) } // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->mQueryID) + if (!self || query_id != self->mQueryID) { return; } @@ -2331,7 +2330,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**) msg->getS32( "QueryReplies", "PriceForListing", price_for_listing,i); if (classified_id.isNull()) { - LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("classifieds_edit")->getValue().asString(); search_results->setEnabled(FALSE); @@ -2379,7 +2378,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_events("panel_ls_events"); FSPanelSearchEvents::FSPanelSearchEvents() : FSSearchPanelBase() -, mQueryID(NULL) +, mQueryID(nullptr) , mResultsReceived(0) , mStartSearch(0) , mDay(0) @@ -2617,7 +2616,7 @@ void FSPanelSearchEvents::onSelectItem() return; } S32 event_id = mSearchResults->getSelectedValue(); - FSFloaterSearch* search_instance = LLFloaterReg::getTypedInstance("search"); + FSFloaterSearch* search_instance = LLFloaterReg::findTypedInstance("search"); if (search_instance) { search_instance->FSFloaterSearch::onSelectedEvent(event_id); @@ -2643,10 +2642,10 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**) } LL_DEBUGS("Search") << "received directory request - QueryID: " << query_id << " AgentID: " << agent_id << LL_ENDL; - FSPanelSearchEvents* self = (FSPanelSearchEvents*)FSFloaterSearch::getSearchPanel("panel_ls_events"); + FSPanelSearchEvents* self = FSFloaterSearch::getSearchPanel("panel_ls_events"); // floater is closed or these are not results from our last request - if (NULL == self || query_id != self->mQueryID) + if (!self || query_id != self->mQueryID) { return; } @@ -2741,7 +2740,7 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**) // Skip empty events... if (owner_id.isNull()) { - LL_INFOS("Search") << "Skipped " << event_id << " because of a NULL owner result" << LL_ENDL; + LL_INFOS("Search") << "Skipped " << event_id << " because of a nullptr owner result" << LL_ENDL; continue; } // Skips events that don't match our scope... @@ -2817,7 +2816,7 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**) static LLPanelInjector t_panel_fs_search_web("panel_ls_web"); FSPanelSearchWeb::FSPanelSearchWeb() : FSSearchPanelBase() -, mWebBrowser(NULL) +, mWebBrowser(nullptr) , mResetFocusOnLoad(false) { // declare a map that transforms a category name into @@ -2964,7 +2963,7 @@ std::string filterShortWords(std::string query_string) void fillSearchComboBox(LLSearchComboBox* search_combo) { - if (search_combo == NULL) + if (search_combo == nullptr) { return; } diff --git a/indra/newview/fsfloatersearch.h b/indra/newview/fsfloatersearch.h index 88baf70468..0f6ba1b52a 100644 --- a/indra/newview/fsfloatersearch.h +++ b/indra/newview/fsfloatersearch.h @@ -362,7 +362,9 @@ public: U32 eventCover, LLVector3d eventGlobalPos); void setLoadingProgress(bool started); - static LLPanel* getSearchPanel(std::string panel_name); + + template + static T* getSearchPanel(const std::string& panel_name); private: virtual void onClose(bool app_quitting); From 8cfd82c946aa83b5da5c49dede41164983bc8ebb Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 2 Jun 2020 00:18:58 +0200 Subject: [PATCH 14/16] This shouldn't have been replaced... --- indra/newview/fsfloatersearch.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp index 187b49bd42..778faeda38 100644 --- a/indra/newview/fsfloatersearch.cpp +++ b/indra/newview/fsfloatersearch.cpp @@ -955,7 +955,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**) if (agent_id.isNull()) { - LL_INFOS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; + LL_INFOS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("people_edit")->getValue().asString(); search_results->setEnabled(FALSE); @@ -1600,7 +1600,7 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**) msg->getF32( "QueryReplies", "Dwell", dwell, i); if (parcel_id.isNull()) { - LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("places_edit")->getValue().asString(); search_results->setEnabled(FALSE); @@ -1947,7 +1947,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**) msg->getS32( "QueryReplies", "ActualArea", area, i); if (parcel_id.isNull()) { - LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; search_results->setEnabled(FALSE); search_results->setCommentText(LLTrans::getString("no_results")); } @@ -2330,7 +2330,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**) msg->getS32( "QueryReplies", "PriceForListing", price_for_listing,i); if (classified_id.isNull()) { - LL_DEBUGS("Search") << "nullptr result returned for QueryID: " << query_id << LL_ENDL; + LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL; LLStringUtil::format_map_t map; map["[TEXT]"] = self->getChild("classifieds_edit")->getValue().asString(); search_results->setEnabled(FALSE); From 286f89dd6143de9a8b1e9bdcd8bf2858c40caf0a Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Tue, 2 Jun 2020 14:54:56 +0200 Subject: [PATCH 15/16] FIRE-29641 Russian translation update (Phototools flater) --- .../default/xui/ru/floater_phototools.xml | 550 ++++++++++++++++++ 1 file changed, 550 insertions(+) create mode 100644 indra/newview/skins/default/xui/ru/floater_phototools.xml diff --git a/indra/newview/skins/default/xui/ru/floater_phototools.xml b/indra/newview/skins/default/xui/ru/floater_phototools.xml new file mode 100644 index 0000000000..a8e413e9be --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_phototools.xml @@ -0,0 +1,550 @@ + + + + + + + Настройка Окружающей среды + + + + + + + + + + Небо + + + Вода + + + Цикл Дня + +