From ed6409fa7e5b7545e2bf265f1ac47318f4799c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ol=C3=ADvia?= Date: Thu, 30 Jan 2025 14:22:30 -0300 Subject: [PATCH 01/78] pt --- indra/newview/skins/ansastorm/xui/pt | 1 + 1 file changed, 1 insertion(+) create mode 100644 indra/newview/skins/ansastorm/xui/pt diff --git a/indra/newview/skins/ansastorm/xui/pt b/indra/newview/skins/ansastorm/xui/pt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/indra/newview/skins/ansastorm/xui/pt @@ -0,0 +1 @@ + From b01674dd4aa555c3908280aab9cbc3773d04a677 Mon Sep 17 00:00:00 2001 From: olizinha Date: Thu, 30 Jan 2025 14:28:52 -0300 Subject: [PATCH 02/78] https://github.com/olizinha/phoenix-firestorm/tree/master/indra/newview/skins/ansastorm/xui --- indra/newview/skins/ansastorm/xui/pl/panel_edit_skin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_edit_skin.xml b/indra/newview/skins/ansastorm/xui/pl/panel_edit_skin.xml index 5c14e5e3d4..be7a5f8f57 100644 --- a/indra/newview/skins/ansastorm/xui/pl/panel_edit_skin.xml +++ b/indra/newview/skins/ansastorm/xui/pl/panel_edit_skin.xml @@ -1,7 +1,7 @@ - + From 7aad104f47bdc977248c541669294a2247f56bba Mon Sep 17 00:00:00 2001 From: olizinha Date: Thu, 30 Jan 2025 20:22:15 -0300 Subject: [PATCH 03/78] Update Portuguese translation --- .../skins/ansastorm/xui/pt/floater_camera.xml | 41 +++++++ .../xui/pt/floater_preview_texture.xml | 47 +++++++ .../ansastorm/xui/pt/panel_edit_eyes.xml | 11 ++ .../ansastorm/xui/pt/panel_edit_gloves.xml | 12 ++ .../ansastorm/xui/pt/panel_edit_hair.xml | 32 +++++ .../ansastorm/xui/pt/panel_edit_jacket.xml | 13 ++ .../ansastorm/xui/pt/panel_edit_pants.xml | 12 ++ .../ansastorm/xui/pt/panel_edit_physics.xml | 52 ++++++++ .../ansastorm/xui/pt/panel_edit_shape.xml | 59 +++++++++ .../ansastorm/xui/pt/panel_edit_shirt.xml | 12 ++ .../ansastorm/xui/pt/panel_edit_shoes.xml | 12 ++ .../ansastorm/xui/pt/panel_edit_skin.xml | 30 +++++ .../ansastorm/xui/pt/panel_edit_skirt.xml | 12 ++ .../ansastorm/xui/pt/panel_edit_socks.xml | 12 ++ .../xui/pt/panel_edit_underpants.xml | 12 ++ .../xui/pt/panel_edit_undershirt.xml | 12 ++ .../ansastorm/xui/pt/panel_main_inventory.xml | 115 ++++++++++++++++++ 17 files changed, 496 insertions(+) create mode 100644 indra/newview/skins/ansastorm/xui/pt/floater_camera.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/floater_preview_texture.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_eyes.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_gloves.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_hair.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_jacket.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_pants.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_physics.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_shape.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_shirt.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_shoes.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_skin.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_skirt.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_socks.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_underpants.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_edit_undershirt.xml create mode 100644 indra/newview/skins/ansastorm/xui/pt/panel_main_inventory.xml diff --git a/indra/newview/skins/ansastorm/xui/pt/floater_camera.xml b/indra/newview/skins/ansastorm/xui/pt/floater_camera.xml new file mode 100644 index 0000000000..22c7d7c3f5 --- /dev/null +++ b/indra/newview/skins/ansastorm/xui/pt/floater_camera.xml @@ -0,0 +1,41 @@ + + + + Girar a câmera em torno do foco + + + Zoom da câmera em direção ao foco + + + Mover a câmera para cima, para baixo, esquerda e direita + + + Visualizar Objeto + + + Use a predefinição + + + + + + + + + [https://docs.primfeed.com Learn more about Primfeed] + + + diff --git a/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml b/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml new file mode 100644 index 0000000000..237fbbf3e0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + x + + + + + + + Refreshing... + + + + + + + + Description: + + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index d6f10ff08b..b7fa508494 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml @@ -52,6 +52,7 @@ height="22" image_overlay="Snapshot_Inventory" image_overlay_alignment="left" + image_overlay_width="16" image_top_pad="-1" imgoverlay_label_space="10" label="Save to Inventory" @@ -111,6 +112,30 @@ function="Snapshot.SendToFlickr"/> + + + Problem connecting to Flickr Problem posting to Flickr Problem disconnecting from Flickr + Connecting to Primfeed... + Not Authorized... + Posting... + Problem posting to Primfeed Black & White @@ -2767,6 +2771,8 @@ name="Command_360_Capture_Label">360° Snapshot Beacons Poser Pose your avatar and animated objects + Primfeed + Post directly to your Primfeed account. Capture a 360° equirectangular image From 19fcb8daeead3f677289f5a4c781c7fb73239c2c Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 20 May 2025 00:03:29 +0100 Subject: [PATCH 52/78] Tweaks to Primfeed for Linux build --- indra/newview/fsfloaterprimfeed.cpp | 5 +++++ indra/newview/fsprimfeedauth.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/fsfloaterprimfeed.cpp b/indra/newview/fsfloaterprimfeed.cpp index 28d558dbf4..53cbb03a9b 100644 --- a/indra/newview/fsfloaterprimfeed.cpp +++ b/indra/newview/fsfloaterprimfeed.cpp @@ -875,6 +875,11 @@ void FSFloaterPrimfeed::draw() mStatusErrorText->setValue(status_text); break; } + default: + { + LL_WARNS("Prmfeed") << "unexpected state" << connection_state << LL_ENDL; + break; + } } } else if (FSPrimfeedAuth::isPendingAuth()) diff --git a/indra/newview/fsprimfeedauth.cpp b/indra/newview/fsprimfeedauth.cpp index 2321474ec5..debb75bca9 100644 --- a/indra/newview/fsprimfeedauth.cpp +++ b/indra/newview/fsprimfeedauth.cpp @@ -24,7 +24,8 @@ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA * http://www.firestormviewer.org * $/LicenseInfo$ -* +*/ + /* * Handles Primfeed authentication and authorisation through a multi-factor OAuth flow. * From 29b31aa7593572d31ca62ce5424bd98174761102 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 20 May 2025 09:12:20 +0100 Subject: [PATCH 53/78] Cheer up the grumpy Mac compiler and modernise things a bit too --- indra/newview/fsfloaterprimfeed.cpp | 100 ++++++++++++++-------------- indra/newview/fsfloaterprimfeed.h | 4 +- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/indra/newview/fsfloaterprimfeed.cpp b/indra/newview/fsfloaterprimfeed.cpp index 53cbb03a9b..effa0227e7 100644 --- a/indra/newview/fsfloaterprimfeed.cpp +++ b/indra/newview/fsfloaterprimfeed.cpp @@ -69,19 +69,19 @@ static LLPanelInjector t_panel_account("fsprimfeedaccoun FSPrimfeedPhotoPanel::FSPrimfeedPhotoPanel() : mResolutionComboBox(nullptr), mRefreshBtn(nullptr), - mBtnPreview(nullptr), mWorkingLabel(nullptr), mThumbnailPlaceholder(nullptr), mDescriptionTextBox(nullptr), mLocationCheckbox(nullptr), mRatingComboBox(nullptr), - mBigPreviewFloater(nullptr), - mPostButton(nullptr) + mPostButton(nullptr), + mBtnPreview(nullptr), + mBigPreviewFloater(nullptr) { - mCommitCallbackRegistrar.add("SocialSharing.SendPhoto", [this](LLUICtrl* ctrl, const LLSD& data) { onSend(); }); - mCommitCallbackRegistrar.add("SocialSharing.RefreshPhoto", [this](LLUICtrl* ctrl, const LLSD& data) { onClickNewSnapshot(); }); - mCommitCallbackRegistrar.add("SocialSharing.BigPreview", [this](LLUICtrl* ctrl, const LLSD& data) { onClickBigPreview(); }); - mCommitCallbackRegistrar.add("Primfeed.Info", [this](LLUICtrl* ctrl, const LLSD& param) { + mCommitCallbackRegistrar.add("SocialSharing.SendPhoto", [this](LLUICtrl* , const LLSD& ) { onSend(); }); + mCommitCallbackRegistrar.add("SocialSharing.RefreshPhoto", [this](LLUICtrl* , const LLSD& ) { onClickNewSnapshot(); }); + mCommitCallbackRegistrar.add("SocialSharing.BigPreview", [this](LLUICtrl* , const LLSD& ) { onClickBigPreview(); }); + mCommitCallbackRegistrar.add("Primfeed.Info", [](LLUICtrl* , const LLSD& param) { const std::string url = param.asString(); LL_DEBUGS("primfeed") << "Info button clicked, opening " << url << LL_ENDL; LLWeb::loadURLExternal(url); @@ -104,7 +104,7 @@ FSPrimfeedPhotoPanel::~FSPrimfeedPhotoPanel() bool FSPrimfeedPhotoPanel::postBuild() { - setVisibleCallback([this](LLUICtrl * unused, bool visible) { + setVisibleCallback([this](LLUICtrl * , bool visible) { onVisibilityChange(visible); }); @@ -136,10 +136,10 @@ bool FSPrimfeedPhotoPanel::postBuild() // Update filter list std::vector filter_list = LLImageFiltersManager::getInstance()->getFiltersList(); - LLComboBox* filterbox = static_cast(mFilterComboBox); - for (U32 i = 0; i < filter_list.size(); i++) + auto * filterbox = static_cast(mFilterComboBox); + for (const std::string& filter : filter_list) { - filterbox->add(filter_list[i]); + filterbox->add(filter); } return LLPanel::postBuild(); @@ -171,8 +171,9 @@ S32 FSPrimfeedPhotoPanel::notify(const LLSD& info) // The refresh button is initially hidden. We show it after the first update, // i.e. after snapshot is taken - LLUICtrl * refresh_button = getRefreshBtn(); - if (!refresh_button->getVisible()) + + if (LLUICtrl * refresh_button = getRefreshBtn(); + !refresh_button->getVisible()) { refresh_button->setVisible(true); } @@ -184,7 +185,7 @@ S32 FSPrimfeedPhotoPanel::notify(const LLSD& info) void FSPrimfeedPhotoPanel::draw() { - LLSnapshotLivePreview * previewp = static_cast(mPreviewHandle.get()); + auto previewp = static_cast(mPreviewHandle.get()); // Enable interaction only if no transaction with the service is on-going (prevent duplicated posts) auto can_post = !(FSPrimfeedConnect::instance().isTransactionOngoing()) && FSPrimfeedAuth::isAuthorized(); @@ -242,7 +243,7 @@ void FSPrimfeedPhotoPanel::draw() LLSnapshotLivePreview* FSPrimfeedPhotoPanel::getPreviewView() { - LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)mPreviewHandle.get(); + auto previewp = (LLSnapshotLivePreview*)mPreviewHandle.get(); return previewp; } @@ -264,7 +265,7 @@ void FSPrimfeedPhotoPanel::onVisibilityChange(bool visible) LLRect full_screen_rect = getRootView()->getRect(); LLSnapshotLivePreview::Params p; p.rect(full_screen_rect); - LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p); + auto previewp = new LLSnapshotLivePreview(p); mPreviewHandle = previewp->getHandle(); previewp->setContainer(this); @@ -303,7 +304,7 @@ void FSPrimfeedPhotoPanel::onClickBigPreview() } } -bool FSPrimfeedPhotoPanel::isPreviewVisible() +bool FSPrimfeedPhotoPanel::isPreviewVisible() const { return (mBigPreviewFloater && mBigPreviewFloater->getVisible()); } @@ -323,7 +324,7 @@ void FSPrimfeedPhotoPanel::onSend() sendPhoto(); } -bool FSPrimfeedPhotoPanel::onPrimfeedConnectStateChange(const LLSD& data) +bool FSPrimfeedPhotoPanel::onPrimfeedConnectStateChange(const LLSD& /*data*/) { if (FSPrimfeedAuth::isAuthorized()) { @@ -342,7 +343,7 @@ void FSPrimfeedPhotoPanel::sendPhoto() "adult_plus" // 4 }; - auto ratingToString = [&](int rating) -> std::string { + auto ratingToString = [&](int rating) { // clamp into [1,4] int idx = llclamp(rating, 1, 4) - 1; return RATING_NAMES[idx]; @@ -366,8 +367,9 @@ void FSPrimfeedPhotoPanel::sendPhoto() params["is_commercial"] = commercial_content; params["post_to_public_gallery"] = post_to_public_gallery; // Add the location if required - bool add_location = mLocationCheckbox->getValue().asBoolean(); - if (add_location) + + if (bool add_location = mLocationCheckbox->getValue().asBoolean(); + add_location) { // Get the SLURL for the location LLSLURL slurl; @@ -383,8 +385,8 @@ void FSPrimfeedPhotoPanel::sendPhoto() if (success) { FSPrimfeedConnect::instance().setConnectionState(FSPrimfeedConnect::PRIMFEED_POSTED); - static LLCachedControl open_url_on_post(gSavedPerAccountSettings, "FSPrimfeedOpenURLOnPost", true); - if (open_url_on_post) + if (static LLCachedControl open_url_on_post(gSavedPerAccountSettings, "FSPrimfeedOpenURLOnPost", true); + open_url_on_post) { LLWeb::loadURLExternal(url); } @@ -419,16 +421,14 @@ void FSPrimfeedPhotoPanel::clearAndClose() void FSPrimfeedPhotoPanel::updateControls() { - LLSnapshotLivePreview* previewp = getPreviewView(); - bool got_snap = previewp && previewp->getSnapshotUpToDate(); - + // LLSnapshotLivePreview* previewp = getPreviewView(); updateResolution(false); } void FSPrimfeedPhotoPanel::updateResolution(bool do_update) { - LLComboBox* combobox = static_cast(mResolutionComboBox); - LLComboBox* filterbox = static_cast(mFilterComboBox); + auto combobox = static_cast(mResolutionComboBox); + auto filterbox = static_cast(mFilterComboBox); std::string sdstring = combobox->getSelectedValue(); LLSD sdres; @@ -441,12 +441,13 @@ void FSPrimfeedPhotoPanel::updateResolution(bool do_update) // Note : index 0 of the filter drop down is assumed to be "No filter" in whichever locale std::string filter_name = (filterbox->getCurrentIndex() ? filterbox->getSimple() : ""); - LLSnapshotLivePreview * previewp = static_cast(mPreviewHandle.get()); - if (previewp && combobox->getCurrentIndex() >= 0) + if (auto previewp = static_cast(mPreviewHandle.get()); + previewp && combobox->getCurrentIndex() >= 0) { checkAspectRatio(width); - S32 original_width = 0 , original_height = 0 ; + S32 original_width = 0; + S32 original_height = 0 ; previewp->getSize(original_width, original_height) ; if (width == 0 || height == 0) @@ -591,16 +592,16 @@ bool FSPrimfeedPhotoPanel::checkImageSize(LLSnapshotLivePreview* previewp, S32& } //aspect ratio of the current window - F32 aspect_ratio = (F32)gViewerWindow->getWindowWidthRaw() / gViewerWindow->getWindowHeightRaw() ; + F32 aspect_ratio = static_cast(gViewerWindow->getWindowWidthRaw()) / static_cast(gViewerWindow->getWindowHeightRaw()); //change another value proportionally if(isWidthChanged) { - height = ll_round(width / aspect_ratio) ; + height = ll_round(static_cast(width) / aspect_ratio) ; } else { - width = ll_round(height * aspect_ratio) ; + width = ll_round(static_cast(height) * aspect_ratio) ; } //bound w/h by the max_value @@ -609,12 +610,12 @@ bool FSPrimfeedPhotoPanel::checkImageSize(LLSnapshotLivePreview* previewp, S32& if(width > height) { width = max_value ; - height = (S32)(width / aspect_ratio) ; + height = ll_round(static_cast(width) / aspect_ratio) ; } else { height = max_value ; - width = (S32)(height * aspect_ratio) ; + width = ll_round(static_cast(height) * aspect_ratio) ; } } } @@ -634,11 +635,11 @@ mPanelButtons(nullptr), mConnectButton(nullptr), mDisconnectButton(nullptr) { - mCommitCallbackRegistrar.add("SocialSharing.Connect", [this](LLUICtrl* ctrl, const LLSD& data) { onConnect(); }); - mCommitCallbackRegistrar.add("SocialSharing.Disconnect", [this](LLUICtrl* ctrl, const LLSD& data) { onDisconnect(); }); + mCommitCallbackRegistrar.add("SocialSharing.Connect", [this](LLUICtrl* , const LLSD& ) { onConnect(); }); + mCommitCallbackRegistrar.add("SocialSharing.Disconnect", [this](LLUICtrl* , const LLSD& ) { onDisconnect(); }); FSPrimfeedAuth::sPrimfeedAuthPump->listen("FSPrimfeedAccountPanel", - [this](const LLSD& data) -> bool + [this](const LLSD& data) { bool success = data["success"].asBoolean(); this->primfeedAuthResponse(success, data); @@ -646,7 +647,7 @@ mDisconnectButton(nullptr) } ); - setVisibleCallback([this](LLUICtrl *unused, bool visible) { + setVisibleCallback([this](LLUICtrl *, bool visible) { onVisibilityChange(visible); }); } @@ -709,7 +710,7 @@ void FSPrimfeedAccountPanel::onVisibilityChange(bool visible) } } -bool FSPrimfeedAccountPanel::onPrimfeedConnectStateChange(const LLSD& data) +bool FSPrimfeedAccountPanel::onPrimfeedConnectStateChange(const LLSD& ) { if (FSPrimfeedAuth::isAuthorized()) { @@ -795,13 +796,13 @@ FSFloaterPrimfeed::FSFloaterPrimfeed(const LLSD& key) : LLFloater(key), mStatusLoadingText(nullptr), mStatusLoadingIndicator(nullptr) { - mCommitCallbackRegistrar.add("SocialSharing.Cancel", [this](LLUICtrl* ctrl, const LLSD& data) { onCancel(); }); + mCommitCallbackRegistrar.add("SocialSharing.Cancel", [this](LLUICtrl* , const LLSD& ) { onCancel(); }); } void FSFloaterPrimfeed::onClose(bool app_quitting) -{ - LLFloaterBigPreview* big_preview_floater = dynamic_cast(LLFloaterReg::getInstance("big_preview")); - if (big_preview_floater) +{ + if (auto big_preview_floater = dynamic_cast(LLFloaterReg::getInstance("big_preview")); + big_preview_floater) { big_preview_floater->closeOnFloaterOwnerClosing(this); } @@ -810,8 +811,8 @@ void FSFloaterPrimfeed::onClose(bool app_quitting) void FSFloaterPrimfeed::onCancel() { - LLFloaterBigPreview* big_preview_floater = dynamic_cast(LLFloaterReg::getInstance("big_preview")); - if (big_preview_floater) + if (auto big_preview_floater = dynamic_cast(LLFloaterReg::getInstance("big_preview")); + big_preview_floater) { big_preview_floater->closeOnFloaterOwnerClosing(this); } @@ -833,8 +834,9 @@ bool FSFloaterPrimfeed::postBuild() void FSFloaterPrimfeed::showPhotoPanel() { - LLTabContainer* parent = dynamic_cast(mPrimfeedPhotoPanel->getParent()); - if (!parent) + auto parent = dynamic_cast(mPrimfeedPhotoPanel->getParent()); + if ( + !parent) { LL_WARNS() << "Cannot find panel container" << LL_ENDL; return; diff --git a/indra/newview/fsfloaterprimfeed.h b/indra/newview/fsfloaterprimfeed.h index 58c864577b..bdd4f59189 100644 --- a/indra/newview/fsfloaterprimfeed.h +++ b/indra/newview/fsfloaterprimfeed.h @@ -73,7 +73,7 @@ public: void uploadCallback(bool success, const LLSD& response); private: - bool isPreviewVisible(); + bool isPreviewVisible() const; void attachPreview(); bool checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, bool isWidthChanged, S32 max_value); @@ -131,7 +131,7 @@ private: class FSFloaterPrimfeed : public LLFloater { public: - FSFloaterPrimfeed(const LLSD& key); + explicit FSFloaterPrimfeed(const LLSD& key); static void update(); bool postBuild(); void draw(); From ca7b4058e788603c6a980d28d0e78249f7f428ab Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 May 2025 18:33:14 +0200 Subject: [PATCH 54/78] Fix mesh res enabled check --- indra/newview/llmeshrepository.cpp | 12 +++++++----- indra/newview/llviewerregion.cpp | 12 ++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 816dd7727e..90c5132882 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -6210,13 +6210,15 @@ bool LLMeshRepository::meshRezEnabled() // FIRE-35602 etc - Mesh not appearing after TP/login (opensim only) // For OpenSim there is still an outside chance that mesh rezzing is disabled on the sim/region // restore the old behaviour but keep the bias to mesh_enabled == true in the underlying checks. -#ifdef OPENSIM - LLViewerRegion *region = gAgent.getRegion(); - if(mesh_enabled && - region) +#ifdef OPENSIM + if (LLGridManager::instance().isInOpenSim()) { - return region->meshRezEnabled(); + if (LLViewerRegion* region = gAgent.getRegion(); mesh_enabled && region) + { + return region->meshRezEnabled(); + } } + else #endif // OPENSIM // return mesh_enabled; diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index f88545d121..c214507a46 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -3988,19 +3988,11 @@ bool LLViewerRegion::bakesOnMeshEnabled() const #ifdef OPENSIM bool LLViewerRegion::meshRezEnabled() const { - if (LLGridManager::getInstance()->isInOpenSim()) - { - if(!mSimulatorFeaturesReceived) - { - LL_DEBUGS("MeshRez") << "MeshRezEnabled: SimulatorFeatures not received yet. Defaulting to true" << LL_ENDL; - return true; - } - } - return (mSimulatorFeatures.has("MeshRezEnabled") && - mSimulatorFeatures["MeshRezEnabled"].asBoolean()); + return (mSimulatorFeatures.has("MeshRezEnabled") && mSimulatorFeatures["MeshRezEnabled"].asBoolean()); } #endif // + bool LLViewerRegion::dynamicPathfindingEnabled() const { return ( mSimulatorFeatures.has("DynamicPathfindingEnabled") && From 0e11e708527eda8ef42c7edc8e6b1c518fcfc067 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 May 2025 18:47:54 +0200 Subject: [PATCH 55/78] Fix for previous commit --- indra/newview/llmeshrepository.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 90c5132882..1a0f90bb3a 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -6218,7 +6218,6 @@ bool LLMeshRepository::meshRezEnabled() return region->meshRezEnabled(); } } - else #endif // OPENSIM // return mesh_enabled; From adf62e9321fbee1d543334e4d42d751c8c819d25 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 May 2025 18:48:09 +0200 Subject: [PATCH 56/78] Use AE instead of BE --- indra/newview/fsprimfeedauth.cpp | 2 +- indra/newview/llpanelsnapshotoptions.cpp | 8 +++----- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/indra/newview/fsprimfeedauth.cpp b/indra/newview/fsprimfeedauth.cpp index debb75bca9..37dbc0fe59 100644 --- a/indra/newview/fsprimfeedauth.cpp +++ b/indra/newview/fsprimfeedauth.cpp @@ -117,7 +117,7 @@ void FSPrimfeedAuth::initiateAuthRequest() { if (sPrimfeedAuth) { - LLNotificationsUtil::add("PrimfeedAuthorisationAlreadyInProgress"); + LLNotificationsUtil::add("PrimfeedAuthorizationAlreadyInProgress"); return; } // If no token stored, begin the login request; otherwise check user status. diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp index 3864a427fc..fd5d36e65d 100644 --- a/indra/newview/llpanelsnapshotoptions.cpp +++ b/indra/newview/llpanelsnapshotoptions.cpp @@ -117,8 +117,7 @@ void LLPanelSnapshotOptions::onSendToFlickr() { LLFloaterReg::hideInstance("snapshot"); - LLFloaterFlickr* flickr_floater = dynamic_cast(LLFloaterReg::getInstance("flickr")); - if (flickr_floater) + if (auto flickr_floater = LLFloaterReg::getTypedInstance("flickr")) { flickr_floater->showPhotoPanel(); } @@ -131,11 +130,10 @@ void LLPanelSnapshotOptions::onSendToPrimfeed() { LLFloaterReg::hideInstance("snapshot"); - auto* primfeed_floater = dynamic_cast(LLFloaterReg::getInstance("primfeed")); - if (primfeed_floater) + if (auto primfeed_floater = LLFloaterReg::getTypedInstance("primfeed")) { primfeed_floater->showPhotoPanel(); } LLFloaterReg::showInstance("primfeed"); } -// \ No newline at end of file +// diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 04a4d6e5d6..27bd353f14 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -14699,27 +14699,27 @@ Login request denied by Primfeed. -Primfeed authorisation failed. The authorisation sequence was not completed. +Primfeed authorization failed. The authorization sequence was not completed. -Primfeed authorisation is already in progress. Please complete the primfeed authorisation in your web browser before trying again. +Primfeed authorization is already in progress. Please complete the primfeed authorization in your web browser before trying again. -Primfeed authorisation completed. You may now post images to Primfeed. +Primfeed authorization completed. You may now post images to Primfeed. Date: Tue, 20 May 2025 19:30:18 +0200 Subject: [PATCH 57/78] Updated Polish translation; Few fixes in English one (Primfeed) --- .../skins/default/xui/en/floater_primfeed.xml | 2 +- .../skins/default/xui/en/notifications.xml | 4 +-- .../default/xui/en/panel_primfeed_account.xml | 1 + .../default/xui/en/panel_primfeed_photo.xml | 19 ++++++----- .../skins/default/xui/pl/floater_primfeed.xml | 17 ++++++++++ .../skins/default/xui/pl/menu_viewer.xml | 2 ++ .../skins/default/xui/pl/notifications.xml | 24 ++++++++++++++ .../default/xui/pl/panel_primfeed_account.xml | 19 +++++++++++ .../default/xui/pl/panel_primfeed_photo.xml | 33 +++++++++++++++++++ .../default/xui/pl/panel_snapshot_options.xml | 3 ++ .../newview/skins/default/xui/pl/strings.xml | 15 +++++++++ 11 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 indra/newview/skins/default/xui/pl/floater_primfeed.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_primfeed_account.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml diff --git a/indra/newview/skins/default/xui/en/floater_primfeed.xml b/indra/newview/skins/default/xui/en/floater_primfeed.xml index fa06d62c1f..6b03fee976 100644 --- a/indra/newview/skins/default/xui/en/floater_primfeed.xml +++ b/indra/newview/skins/default/xui/en/floater_primfeed.xml @@ -41,7 +41,7 @@ class="fsprimfeedaccountpanel" follows="all" label="Account" - name="panel_primfeed_account"/> + name="panel_primfeed_account"/> -Your primfeed post can now be viewed [[PF_POSTURL] here]. +Your Primfeed post can now be viewed [[PF_POSTURL] here]. @@ -14711,7 +14711,7 @@ Primfeed authorization failed. The authorization sequence was not completed. persist="false" tag="fail" type="alertmodal"> -Primfeed authorization is already in progress. Please complete the primfeed authorization in your web browser before trying again. +Primfeed authorization is already in progress. Please complete the Primfeed authorization in your web browser before trying again.