aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llinventory.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/llinventory/llinventory.h
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/llinventory/llinventory.h')
-rw-r--r--linden/indra/llinventory/llinventory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 76d439b..3662d63 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -230,7 +230,6 @@ public:
230 // network ok. It uses a simple crc check which is defeatable, but 230 // network ok. It uses a simple crc check which is defeatable, but
231 // we want to detect network mangling somehow. 231 // we want to detect network mangling somehow.
232 virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); 232 virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
233
234 // file support 233 // file support
235 virtual BOOL importFile(FILE* fp); 234 virtual BOOL importFile(FILE* fp);
236 virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; 235 virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const;
@@ -288,6 +287,9 @@ public:
288 virtual void packMessage(LLMessageSystem* msg) const; 287 virtual void packMessage(LLMessageSystem* msg) const;
289 virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); 288 virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
290 289
290 LLSD asLLSD() const;
291 bool fromLLSD(LLSD& sd);
292
291 // file support 293 // file support
292 virtual BOOL importFile(FILE* fp); 294 virtual BOOL importFile(FILE* fp);
293 virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; 295 virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const;