livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q

master
Andrey Lihatskiy 2022-11-01 23:11:57 +02:00
parent d4d5d4018d d0e07c770b
commit 39e08b34b1
9 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -1392,6 +1392,7 @@ Sovereign Engineer
SL-18394 SL-18394
SL-18412 SL-18412
SL-18497 SL-18497
SL-18525
SpacedOut Frye SpacedOut Frye
VWR-34 VWR-34
VWR-45 VWR-45

2
indra/llcommon/llerror.cpp
View File

@ -943,7 +943,7 @@ namespace LLError
for (a = sets.beginArray(), end = sets.endArray(); a != end; ++a) for (a = sets.beginArray(), end = sets.endArray(); a != end; ++a)
{ {
const LLSD& entry = *a; const LLSD& entry = *a;
if (entry.isMap() && !entry.emptyMap()) if (entry.isMap() && entry.size() != 0)
{ {
ELevel level = decodeLevel(entry["level"]); ELevel level = decodeLevel(entry["level"]);

2
indra/llui/llmultislider.cpp
View File

@ -92,7 +92,7 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p)
mMouseDownSignal(NULL), mMouseDownSignal(NULL),
mMouseUpSignal(NULL) mMouseUpSignal(NULL)
{ {
mValue.emptyMap(); mValue = LLSD::emptyMap();
mCurSlider = LLStringUtil::null; mCurSlider = LLStringUtil::null;
if (mOrientation == HORIZONTAL) if (mOrientation == HORIZONTAL)

2
indra/llwindow/lldxhardware.cpp
View File

@ -1098,7 +1098,7 @@ LLSD LLDXHardware::getDisplayInfo()
} }
LCleanup: LCleanup:
if (ret.emptyMap()) if (!ret.isMap() || (ret.size() == 0))
{ {
LL_INFOS() << "Failed to get data, cleaning up" << LL_ENDL; LL_INFOS() << "Failed to get data, cleaning up" << LL_ENDL;
} }

2
indra/newview/llenvironment.cpp
View File

@ -3085,7 +3085,7 @@ bool LLEnvironment::loadFromSettings()
LL_INFOS("ENVIRONMENT") << "Unable to open previous session environment file " << user_filepath << LL_ENDL; LL_INFOS("ENVIRONMENT") << "Unable to open previous session environment file " << user_filepath << LL_ENDL;
} }
if (!env_data.isMap() || env_data.emptyMap()) if (!env_data.isMap() || (env_data.size() == 0))
{ {
LL_DEBUGS("ENVIRONMENT") << "Empty map loaded from: " << user_filepath << LL_ENDL; LL_DEBUGS("ENVIRONMENT") << "Empty map loaded from: " << user_filepath << LL_ENDL;
return false; return false;

2
indra/newview/llfloatermodelpreview.cpp
View File

@ -1740,7 +1740,7 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
childSetTextArg("download_weight", "[ST]", tbd); childSetTextArg("download_weight", "[ST]", tbd);
childSetTextArg("server_weight", "[SIM]", tbd); childSetTextArg("server_weight", "[SIM]", tbd);
childSetTextArg("physics_weight", "[PH]", tbd); childSetTextArg("physics_weight", "[PH]", tbd);
if (!mModelPhysicsFee.isMap() || mModelPhysicsFee.emptyMap()) if (!mModelPhysicsFee.isMap() || (mModelPhysicsFee.size() == 0))
{ {
childSetTextArg("upload_fee", "[FEE]", tbd); childSetTextArg("upload_fee", "[FEE]", tbd);
} }

2
indra/newview/llimprocessing.cpp
View File

@ -1561,7 +1561,7 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
return; return;
} }
if (messages.emptyArray()) if (messages.size() == 0)
{ {
// Nothing to process // Nothing to process
return; return;

2
indra/newview/llpanelexperiencelog.cpp
View File

@ -112,7 +112,7 @@ void LLPanelExperienceLog::refresh()
int items = 0; int items = 0;
bool moreItems = false; bool moreItems = false;
LLSD events_to_save = events; LLSD events_to_save = events;
if (!events.emptyMap()) if (events.isMap() && events.size() != 0)
{ {
LLSD::map_const_iterator day = events.endMap(); LLSD::map_const_iterator day = events.endMap();
do do

2
indra/newview/llpanelobject.cpp
View File

@ -2119,7 +2119,7 @@ bool LLPanelObject::menuEnableItem(const LLSD& userdata)
} }
else if (command == "params_paste") else if (command == "params_paste")
{ {
return mClipboardParams.isMap() && !mClipboardParams.emptyMap(); return mClipboardParams.isMap() && (mClipboardParams.size() != 0);
} }
// copy options // copy options
else if (command == "psr_copy") else if (command == "psr_copy")