summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregiondebugconsole.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-06 09:53:57 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-06 09:53:57 -0500
commitb3e34545a4d37444a2def3462d75e185df5535d0 (patch)
treef4a09ef60040db8399528a7f3564b5d265b3e22a /indra/newview/llfloaterregiondebugconsole.cpp
parent7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff)
parent54cdc322b8f2bd35b289cacf3493622e7cc51194 (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..0cde878055 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)
{
sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
}