diff options
| author | simon <simon@lindenlab.com> | 2023-05-12 17:29:41 +0100 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2023-05-24 00:25:57 +0100 |
| commit | 55460b49585ceea5d6388204c7f3bd74ed4f4827 (patch) | |
| tree | 82abff5f99357a11eb5579cd076d4cb44c9c1c99 /indra/newview | |
| parent | f366853f22ec6914471d7b265adf53736f080527 (diff) | |
SL-19711 - viewer can't parse environments. Fixed max parsing bug
(cherry picked from commit eb0516b9940f200b32349d611f38f1ccee48005d)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index b1eed81476..f5212a3026 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -312,7 +312,7 @@ void LLSettingsVOBase::onAssetDownloadComplete(const LLUUID &asset_id, S32 statu std::stringstream llsdstream(buffer); LLSD llsdsettings; - if (LLSDSerialize::deserialize(llsdsettings, llsdstream, -1)) + if (LLSDSerialize::deserialize(llsdsettings, llsdstream, LLSDSerialize::SIZE_UNLIMITED)) { settings = createFromLLSD(llsdsettings); } @@ -379,7 +379,7 @@ LLSettingsBase::ptr_t LLSettingsVOBase::importFile(const std::string &filename) return LLSettingsBase::ptr_t(); } - if (!LLSDSerialize::deserialize(settings, file, -1)) + if (!LLSDSerialize::deserialize(settings, file, LLSDSerialize::SIZE_UNLIMITED)) { LL_WARNS("SETTINGS") << "Unable to deserialize settings from '" << filename << "'" << LL_ENDL; return LLSettingsBase::ptr_t(); |