summaryrefslogtreecommitdiff
path: root/indra/llui/llcommandmanager.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-10-10 17:09:31 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-10-10 17:09:31 -0700
commit5b1301ea8a0e50f2d15700a7e93be7628f6feec8 (patch)
treef536cbca14fa0cd81d75e7d354bd75b370c18091 /indra/llui/llcommandmanager.cpp
parentfd03ae299bfaf83789e511912d99d204c0833e7f (diff)
parent2d1431b2f0bb903be9259cbcae630f605d9c208c (diff)
merge
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
-rw-r--r--indra/llui/llcommandmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 9ce7533e1b..d8e035a320 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -41,7 +41,7 @@
// LLCommandId class
//
-const LLCommandId LLCommandId::null("null command");
+const LLCommandId LLCommandId::null = LLCommandId();
//
// LLCommand class
@@ -152,7 +152,7 @@ bool LLCommandManager::load()
if (!commandsParams.validateBlock())
{
- llerrs << "Unable to validate commands param block from file: " << commands_file << llendl;
+ llerrs << "Invalid commands file: " << commands_file << llendl;
return false;
}