diff options
| author | skolb <none@none> | 2009-12-02 10:42:55 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-02 10:42:55 -0800 |
| commit | 6d3ca60f310e50b217a189086b652dca2e3e3854 (patch) | |
| tree | c2c2998727558ea3a5dab5bf9c6c3d52c0b5d81c /indra/llcommon/llsd.h | |
| parent | 9ad99e17734f1898071ec68ed11617f48701eb28 (diff) | |
| parent | 6e1f6f015394a3f268608061c00993939c891e54 (diff) | |
Merge viewer 2.0 into media branch
Diffstat (limited to 'indra/llcommon/llsd.h')
| -rw-r--r-- | indra/llcommon/llsd.h | 6 |
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); |