summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsd.cpp
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
committerNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
commit942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch)
tree02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llcommon/llsd.cpp
parent2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
Merge
Diffstat (limited to 'indra/llcommon/llsd.cpp')
-rwxr-xr-xindra/llcommon/llsd.cpp5
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); }