summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
committerOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
commitf42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch)
tree837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/llui/llsdparam.h
parent94c171d89bae06d0bc259255a917db892019c369 (diff)
parent0b81c19cbe809f041e628da334c305ea33fae2e9 (diff)
merge changes for storm-1538
Diffstat (limited to 'indra/llui/llsdparam.h')
-rw-r--r--indra/llui/llsdparam.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h
index 69dab2b411..f776c781b3 100644
--- a/indra/llui/llsdparam.h
+++ b/indra/llui/llsdparam.h
@@ -93,8 +93,17 @@ class LLSDParamAdapter : public T
LLParamSDParser parser;
parser.readSD(sd, *this);
}
+
+ operator LLSD() const
+ {
+ LLParamSDParser parser;
+ LLSD sd;
+ parser.writeSD(sd, *this);
+ return sd;
+ }
LLSDParamAdapter(const T& val)
+ : T(val)
{
T::operator=(val);
}