diff options
| author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
| commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
| tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/indra/newview/llstatusbar.cpp | |
| parent | Use all those cores for compile (diff) | |
| parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
| download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz | |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llstatusbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp index fbb99f0..4998981 100644 --- a/linden/indra/newview/llstatusbar.cpp +++ b/linden/indra/newview/llstatusbar.cpp | |||
| @@ -860,7 +860,7 @@ class LLBalanceHandler : public LLCommandHandler | |||
| 860 | public: | 860 | public: |
| 861 | // Requires "trusted" browser/URL source | 861 | // Requires "trusted" browser/URL source |
| 862 | LLBalanceHandler() : LLCommandHandler("balance", true) { } | 862 | LLBalanceHandler() : LLCommandHandler("balance", true) { } |
| 863 | bool handle(const LLSD& tokens, const LLSD& query_map, LLWebBrowserCtrl* web) | 863 | bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) |
| 864 | { | 864 | { |
| 865 | if (tokens.size() == 1 | 865 | if (tokens.size() == 1 |
| 866 | && tokens[0].asString() == "request") | 866 | && tokens[0].asString() == "request") |