diff options
| author | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
|---|---|---|
| committer | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
| commit | 5754493cdcfeac76d0576abc19bdf5a03717780d (patch) | |
| tree | e6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/newview/llfloaterregiondebugconsole.cpp | |
| parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
| parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) | |
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/newview/llfloaterregiondebugconsole.cpp')
| -rw-r--r-- | indra/newview/llfloaterregiondebugconsole.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp index 271fb2f9a3..e817589622 100644 --- a/indra/newview/llfloaterregiondebugconsole.cpp +++ b/indra/newview/llfloaterregiondebugconsole.cpp @@ -116,11 +116,11 @@ BOOL LLFloaterRegionDebugConsole::postBuild() mOutput = getChild<LLTextEditor>("region_debug_console_output"); - std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync"); + std::string url = gAgent.getRegionCapability("SimConsoleAsync"); if (url.empty()) { // Fall back to see if the old API is supported. - url = gAgent.getRegion()->getCapability("SimConsole"); + url = gAgent.getRegionCapability("SimConsole"); if (url.empty()) { mOutput->appendText( @@ -139,11 +139,11 @@ void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param) LLLineEditor* input = static_cast<LLLineEditor*>(ctrl); std::string text = input->getText() + "\n"; - std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync"); + std::string url = gAgent.getRegionCapability("SimConsoleAsync"); if (url.empty()) { // Fall back to the old API - url = gAgent.getRegion()->getCapability("SimConsole"); + url = gAgent.getRegionCapability("SimConsole"); if (url.empty()) { text += CONSOLE_UNAVAILABLE + PROMPT; |