summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-01-03 16:30:57 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-01-03 16:30:57 +0200
commitc56298d4ba818aaa5b69a8c30e5b577f7e4596eb (patch)
tree008f3e50c3a2210413d6244db6bb97e9a67fafc7 /indra/llcommon/llsdserialize.h
parenta35008993eef5b1fee5695804c83050cf922d146 (diff)
MAINT-8022 Make unzip silent yet include failure reason into output
Diffstat (limited to 'indra/llcommon/llsdserialize.h')
-rw-r--r--indra/llcommon/llsdserialize.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 23a0c8cfb1..9f58d44fe7 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -814,8 +814,24 @@ public:
}
};
+class LL_COMMON_API LLUZipHelper : public LLRefCount
+{
+public:
+ typedef enum e_zip_result
+ {
+ ZR_OK = 0,
+ ZR_MEM_ERROR,
+ ZR_SIZE_ERROR,
+ ZR_DATA_ERROR,
+ ZR_PARSE_ERROR,
+ } EZipRresult;
+ // return OK or reason for failure
+ static EZipRresult unzip_llsd(LLSD& data, std::istream& is, S32 size);
+};
+
//dirty little zip functions -- yell at davep
LL_COMMON_API std::string zip_llsd(LLSD& data);
-LL_COMMON_API bool unzip_llsd(LLSD& data, std::istream& is, S32 size);
+
+
LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
#endif // LL_LLSDSERIALIZE_H