From 8e8d1eeed6990b29398c4bcc804a1a24f95a16f5 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 20 Dec 2022 21:15:22 -0500
Subject: [PATCH] Fix incorrect LLSD usage
---
indra/newview/llfloaterassetrecovery.cpp | 2 +-
indra/newview/llfloatermodelpreview.cpp | 2 +-
indra/newview/llpanelobject.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfloaterassetrecovery.cpp b/indra/newview/llfloaterassetrecovery.cpp
index 08ecfe38d02..28a5927c1e2 100644
--- a/indra/newview/llfloaterassetrecovery.cpp
+++ b/indra/newview/llfloaterassetrecovery.cpp
@@ -107,7 +107,7 @@ void LLFloaterAssetRecovery::onBtnRecover()
LLFile::remove(sdFile["path"].asString());
}
- if (!sdFiles.emptyArray())
+ if (sdFiles.isArray() && sdFiles.size() != 0)
new LLAssetRecoverQueue(sdFiles);
closeFloater();
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index eba8c735ce2..76ea05b47dc 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1743,7 +1743,7 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
childSetTextArg("download_weight", "[ST]", tbd);
childSetTextArg("server_weight", "[SIM]", tbd);
childSetTextArg("physics_weight", "[PH]", tbd);
- if (!mModelPhysicsFee.isMap() || mModelPhysicsFee.emptyMap())
+ if (!mModelPhysicsFee.isMap() || mModelPhysicsFee.size() == 0)
{
childSetTextArg("upload_fee", "[FEE]", tbd);
}
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 4ac49fd35a8..176722b3696 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2364,7 +2364,7 @@ bool LLPanelObject::menuEnableItem(const LLSD& userdata)
}
else if (command == "params_paste")
{
- return mClipboardParams.isMap() && !mClipboardParams.emptyMap();
+ return mClipboardParams.isMap() && mClipboardParams.size() != 0;
}
// copy options
else if (command == "psr_copy")
--
GitLab