summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-06-26 17:57:40 -0400
committerNyx Linden <nyx@lindenlab.com>2013-06-26 17:57:40 -0400
commitf388b32137fa150881a62eb852dee44d442fbeaa (patch)
tree0660b9842a289f1538690d7fd286d621dc6b0361 /indra/newview/llviewerinventory.cpp
parentec00f7f14fbf16992b71ddd54e583ba07fdfd523 (diff)
parente2e198d9b36f4ef90ef7ca088e643b1fc399c53e (diff)
merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rwxr-xr-xindra/newview/llviewerinventory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 26aecd39d1..9725ea6456 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -69,8 +69,9 @@
#include "llclipboard.h"
#include "llhttpretrypolicy.h"
-// Two do-nothing ops for use in callbacks.
+// do-nothing ops for use in callbacks.
void no_op_inventory_func(const LLUUID&) {}
+void no_op_llsd_func(const LLSD&) {}
void no_op() {}
///----------------------------------------------------------------------------