From 39ba72179526b2a8c562e727618d1c3a3c19aa53 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 23 Nov 2020 22:39:54 +0100 Subject: [PATCH 01/25] Copy FS icon for SDL --- indra/newview/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ee50037ae2..be81565256 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1796,6 +1796,29 @@ if (LINUX) SET_SOURCE_FILES_PROPERTIES(llviewermenu.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments) endif() # + + # Replace the icons with the appropriate ones for the channel + # ('test' is the default) + set(ICON_PATH "private") + string(TOLOWER ${VIEWER_CHANNEL} channel_lower) + if(channel_lower MATCHES "release") + set(ICON_PATH "release") + elseif(channel_lower MATCHES "beta") + set(ICON_PATH "beta") + elseif(channel_lower MATCHES "project") + set(ICON_PATH "project") + endif() + + if (OPENSIM) + set(ICON_PATH "${ICON_PATH}-os") + endif (OPENSIM) + + message(STATUS "Copying icons for ${ICON_PATH}") + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/firestorm_256.BMP" + "${CMAKE_CURRENT_SOURCE_DIR}/res-sdl/firestorm_icon.BMP" + ) endif (LINUX) if (WINDOWS) From 09acce7337b8136cc1c52a8a7eb29e11361dd0c1 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 24 Nov 2020 17:49:42 +0100 Subject: [PATCH 02/25] FIRE-30518: Multi-preview not working for contents of rezzed objects --- indra/newview/llinventoryfunctions.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 7dc8d71176..3b2484c7ed 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2706,7 +2706,15 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root if (folder_item) { LLInvFVBridge* bridge = dynamic_cast(folder_item->getViewModelItem()); - if (!bridge || !bridge->isMultiPreviewAllowed()) + // FIRE-30518: Multi-preview not working for contents of rezzed objects + // This should prevent multi-previews of settings, but for object inventory items + // this check is always false, since content items in object inventories + // have LLTaskInvFVBridges instead of LLInvFVBridges. Since settings can't be + // opened from inside objects anyway, so restrict the check for actions performed + // on avatar inventories. + //if (!bridge || !bridge->isMultiPreviewAllowed()) + if ("open" == action && (!bridge || !bridge->isMultiPreviewAllowed())) + // { open_multi_preview = false; break; From 85c177459b573526fae5bf337475c7677de10dd1 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 25 Nov 2020 19:54:08 +0100 Subject: [PATCH 03/25] FIRE-30521: Remove confusing (and also not localizable) debug setting comments from quickprefs --- indra/newview/quickprefs.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp index afe9251a31..81570ce6e7 100644 --- a/indra/newview/quickprefs.cpp +++ b/indra/newview/quickprefs.cpp @@ -1372,8 +1372,6 @@ void FloaterQuickPrefs::updateControl(const std::string& controlName, ControlEnt if (var) { widget->setValue(var->getValue()); - widget->setToolTip(var->getComment()); - label_textbox->setToolTip(var->getComment()); } else { From 2a71484c04ebf7aca2ecd765d252ae3af6e6d821 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 26 Nov 2020 01:01:30 +0000 Subject: [PATCH 04/25] Remove hint panel to make room for joint list --- .../default/xui/en/floater_model_preview.xml | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 4332cbad31..b44c2f8129 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1304,9 +1304,9 @@ name="pos_overrides_list" column_padding="0" draw_heading="true" - draw_stripes="false" + draw_stripes="true" heading_height="23" - height="100" + height="199" left_delta="0" top_pad="0" width="385"> @@ -1327,31 +1327,7 @@ name="axis_z" relative_width="0.17" /> - - - Tip: -Too many items use the default (right hand) unnecessarily. - -Please consider using an attachment point close to the item's position on the body. - - Date: Thu, 26 Nov 2020 01:06:42 +0000 Subject: [PATCH 05/25] Add preferences tab to uploader --- indra/newview/llfloatermodelpreview.cpp | 12 ++ .../default/xui/en/floater_model_preview.xml | 168 +++++++++++++++++- 2 files changed, 176 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index cac30efe11..89f3629bb0 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -58,6 +58,7 @@ #include "llsliderctrl.h" #include "llspinctrl.h" #include "lltabcontainer.h" +#include "llcolorswatch.h" // #include "lltrans.h" #include "llcallbacklist.h" #include "llviewertexteditor.h" @@ -193,6 +194,15 @@ BOOL LLFloaterModelPreview::postBuild() getChild("show_joint_overrides")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1)); getChild("show_joint_positions")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1)); getChild("show_uv_guide")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1)); // - Add UV guide overlay to pmesh preview + // support for settings panel of floater + const auto& preview_refresh_cb = [this](LLUICtrl *, const LLSD &){ if(this->mModelPreview){mModelPreview->refresh();}}; + getChild("mesh_preview_canvas_color")->setCommitCallback(preview_refresh_cb); + getChild("mesh_preview_edge_color")->setCommitCallback(preview_refresh_cb); + getChild("mesh_preview_physics_edge_color")->setCommitCallback(preview_refresh_cb); + getChild("mesh_preview_physics_fill_color")->setCommitCallback(preview_refresh_cb); + getChild("mesh_preview_degenerate_edge_color")->setCommitCallback(preview_refresh_cb); + getChild("mesh_preview_degenerate_fill_color")->setCommitCallback(preview_refresh_cb); + // childDisable("upload_skin"); childDisable("upload_joints"); @@ -560,11 +570,13 @@ void add_row_to_list(LLScrollListCtrl *listp, cell_params.column = "model_name"; cell_params.value = name; + cell_params.font_halign = LLFontGL::LEFT; // Fix ugly alignment item_params.columns.add(cell_params); cell_params.column = "axis_x"; cell_params.value = vx; + cell_params.font_halign = LLFontGL::RIGHT; // Fix ugly alignment item_params.columns.add(cell_params); cell_params.column = "axis_y"; diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index b44c2f8129..5d9046f2bc 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1310,8 +1310,8 @@ left_delta="0" top_pad="0" width="385"> - - + + + + + Model Upload Behaviour Settings : + + + + + Model Upload Preview Colors: + + + General : + + + + + Physics : + + + + + Physics Issues: + + + + Date: Thu, 26 Nov 2020 17:06:49 +0100 Subject: [PATCH 06/25] Fix minor layout issues in model preview floater --- .../default/xui/en/floater_model_preview.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 5d9046f2bc..7867185eda 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1395,8 +1395,8 @@ height="12" name="mesh_upload_behaviour_label" top="8" - width="175"> - Model Upload Behaviour Settings : + width="300"> + Model Upload Behaviour Settings: @@ -1413,7 +1413,7 @@ follows="top|left" top_pad="8" left="24" - width="70" + width="300" label="Auto-preview weights" tooltip="Automatically show weights in preview for meshes with rigging info" name="mesh_preview_auto_show_weights"/> @@ -1424,7 +1424,7 @@ height="12" name="mesh_preview_colors_label" top_pad="10" - width="175"> + width="300"> Model Upload Preview Colors: - General : + width="100"> + General: - Physics : + width="100"> + Physics: + width="100"> Physics Issues: Date: Thu, 26 Nov 2020 17:07:03 +0100 Subject: [PATCH 07/25] Update German translation --- .../default/xui/de/floater_model_preview.xml | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml index 5485b6d70a..177733137d 100644 --- a/indra/newview/skins/default/xui/de/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml @@ -359,18 +359,35 @@ - - - Hinweis: -Zu viele Objekte nutzen unnötigerweise den Standard-Anhängepunkt (Rechte Hand). - -Bitte ziehen Sie einen anderen Anhängepunkt nahe der Objektposition in Betracht. - - + + + Modell-Upload-Verhaltenseinstellungen: + + + + + Farben für Modell-Upload: + + + Allgemein: + + + + + Physik: + + + + + Physik-Probleme: + + + +