summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-28 10:43:02 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-28 10:43:02 -0400
commit3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch)
tree448bc57cf16514ef602602feff45ec4583d18608 /indra/llui/llsdparam.h
parentf094d4f7529c27233f5ca228bda21deb9b864f1a (diff)
parentebb55355ebbe6ec6760d8683e461903957ed24e5 (diff)
merge from viewer-pre-release
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);
}