diff options
author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
---|---|---|
committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
commit | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch) | |
tree | af7409521b24318b7c48a7434824178888c17a3e /indra/llcommon/llsd.cpp | |
parent | 0009346667872b90d39089c3800ab3e00ce73b51 (diff) |
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/llcommon/llsd.cpp')
-rw-r--r-- | indra/llcommon/llsd.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index aa4cba99d1..e5f366c4a4 100644 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -10,6 +10,8 @@ #include <sstream> #include <math.h> + +#include "llerror.h" #include "../llmath/llmath.h" #include "llformat.h" @@ -234,7 +236,7 @@ namespace { public: ImplUUID(const LLSD::UUID& v) : Base(v) { } - virtual LLSD::String asString() const{ return mValue.getString(); } + virtual LLSD::String asString() const{ return mValue.asString(); } virtual LLSD::UUID asUUID() const { return mValue; } }; |