diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
commit | 76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch) | |
tree | 0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/llcommon/llsd.cpp | |
parent | ff42e557848158d5a01cc260bac0bbf974650934 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
merge with viewer tools update
Diffstat (limited to 'indra/llcommon/llsd.cpp')
-rwxr-xr-x | indra/llcommon/llsd.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index d8bbb3a74f..57aa7d9c07 100755 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -789,10 +789,7 @@ namespace { inline LLSD::Impl& safe(LLSD::Impl* impl) { return LLSD::Impl::safe(impl); } - - inline const LLSD::Impl& safe(const LLSD::Impl* impl) - { return LLSD::Impl::safe(impl); } - + inline ImplMap& makeMap(LLSD::Impl*& var) { return safe(var).makeMap(var); } |