From 357edecd9b938f2b83a6db0237c6343de7a18fcf Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 4 Aug 2020 15:30:20 +0300 Subject: SL-13669 Change inventory cache to use a standard LLSD format --- indra/llinventory/llinventory.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'indra/llinventory/llinventory.h') diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 70b200e139..d00c4d43ee 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -95,8 +95,7 @@ public: // Implemented here so that a minimal information set can be transmitted // between simulator and viewer. //-------------------------------------------------------------------- - // virtual BOOL importFile(LLFILE* fp); - virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; + virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; @@ -197,8 +196,6 @@ public: // File Support //-------------------------------------------------------------------- public: - virtual BOOL importFile(LLFILE* fp); - virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; @@ -269,8 +266,6 @@ public: // File Support //-------------------------------------------------------------------- public: - virtual BOOL importFile(LLFILE* fp); - virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; -- cgit v1.2.3 From 43941a3d876b854560b06906665d689c3924aed1 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 10 Aug 2020 20:50:27 +0300 Subject: SL-13669 tests should cover import/export category from llsd --- indra/llinventory/llinventory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llinventory/llinventory.h') diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index d00c4d43ee..024afc109c 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -269,6 +269,8 @@ public: virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; + LLSD exportLLSD() const; + bool importLLSD(const LLSD& cat_data); //-------------------------------------------------------------------- // Member Variables //-------------------------------------------------------------------- -- cgit v1.2.3