summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregiondebugconsole.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-03-06 17:21:21 -0500
committerNyx Linden <nyx@lindenlab.com>2013-03-06 17:21:21 -0500
commit25255ee13efdc3e8090412f7fce6bb7723277053 (patch)
treef77c6eb77e3cbcfcf72d1b5998a1275fac002d4c /indra/newview/llfloaterregiondebugconsole.cpp
parent2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff)
parentfe042430b03667abcd6b72ef9cc27d82d85f4242 (diff)
merge
Diffstat (limited to 'indra/newview/llfloaterregiondebugconsole.cpp')
-rw-r--r--indra/newview/llfloaterregiondebugconsole.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index c7fab2573f..3a7ca17b73 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -75,7 +75,7 @@ namespace
{
public:
/* virtual */
- void error(U32 status, const std::string& reason)
+ void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
}