summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsd.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-02 11:29:03 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-02 11:29:03 -0500
commitc40ed43535164c3b80afd34bdb1de211eb023458 (patch)
tree3722435d89e460d046c3355d76dd106052efb61f /indra/llcommon/llsd.h
parent5642d7d0122da91d8ef23f8adb069cc82e0c4ed4 (diff)
parentf496c2b164a100836d74909c3e27adcdf98018f0 (diff)
merging in viewer-2 into avp
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/llcommon/llsd.h')
-rw-r--r--indra/llcommon/llsd.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index 552bb57498..135133c19c 100644
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -223,8 +223,9 @@ public:
bool has(const String&) const;
LLSD get(const String&) const;
- LLSD& insert(const String&, const LLSD&);
+ void insert(const String&, const LLSD&);
void erase(const String&);
+ LLSD& with(const String&, const LLSD&);
LLSD& operator[](const String&);
LLSD& operator[](const char* c) { return (*this)[String(c)]; }
@@ -238,9 +239,10 @@ public:
LLSD get(Integer) const;
void set(Integer, const LLSD&);
- LLSD& insert(Integer, const LLSD&);
+ void insert(Integer, const LLSD&);
void append(const LLSD&);
void erase(Integer);
+ LLSD& with(Integer, const LLSD&);
const LLSD& operator[](Integer) const;
LLSD& operator[](Integer);