diff --git a/indra/newview/llfloaterassetrecovery.cpp b/indra/newview/llfloaterassetrecovery.cpp
index 08ecfe38d028c3e7f7312ff98a054b6bc994e9cd..28a5927c1e2526666b2536ae0bde275de5e1a7ea 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 eba8c735ce222cf2aa85573f2567f67ac22423f8..76ea05b47dc3b8b3e53f85d6f89ab912fd7edf7f 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 4ac49fd35a866bbc8d09e1b4541a6855daa2106b..176722b3696394aaa3a89fda75a2ebb64ee9ccab 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")