1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index d4ad4fc..df4b037 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -14,12 +14,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -170,6 +170,7 @@ static const apr_getopt_option_t TEST_CL_OPTIONS[] =
         {"group", 'g', 1, "Run test group specified by option argument."},
         {"skip", 's', 1, "Skip test number specified by option argument. Only works when a specific group is being tested"},
         {"wait", 'w', 0, "Wait for input before exit."},
+        {"debug", 'd', 0, "Emit full debug logs."},
         {0, 0, 0, 0}
 };
 
@@ -224,7 +225,8 @@ int main(int argc, char **argv)
         LLError::initForApplication(".");
         LLError::setFatalFunction(wouldHaveCrashed);
         LLError::setDefaultLevel(LLError::LEVEL_ERROR);
-                // *FIX: should come from error config file
+                //< *TODO: should come from error config file. Note that we
+                // have a command line option that sets this to debug.
         
 #ifdef CTYPE_WORKAROUND
         ctype_workaround();
@@ -286,6 +288,11 @@ int main(int argc, char **argv)
                 case 'w':
                         wait_at_exit = true;
                         break;
+                case 'd':
+                        // *TODO: should come from error config file. We set it to
+                        // ERROR by default, so this allows full debug levels.
+                        LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+                        break;
                 default:
                         stream_usage(std::cerr, argv[0]);
                         return 1;