summaryrefslogtreecommitdiff
path: root/indra/llinventory/llinventory.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-06-10 16:29:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-06-10 16:29:10 -0400
commit6d46132ef5218cd17d8d201f16e5a7df4b1e39a6 (patch)
tree1a9ea4578e12a4eac75ee43b5aa5833dd990137c /indra/llinventory/llinventory.h
parent89e3959cf393ce9eeb058304264d4f55f4fe9ca2 (diff)
SH-4216 WIP - finished item/cat update and reorg of aisv3 code
Diffstat (limited to 'indra/llinventory/llinventory.h')
-rwxr-xr-xindra/llinventory/llinventory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index cc474f3d4c..b718f0f9b7 100755
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -210,7 +210,7 @@ public:
void unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size);
LLSD asLLSD() const;
void asLLSD( LLSD& sd ) const;
- bool fromLLSD(const LLSD& sd);
+ bool fromLLSD(const LLSD& sd, bool is_new = true);
//--------------------------------------------------------------------
// Member Variables