diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 0f6967e42a13af15ca9ec0180904501323e0c848..1c57d5139c77c8512d7a87924222d8d84076ac51 100644
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -22,7 +22,7 @@
 sets environment variable FOO=bar, then runs:
 myprog somearg otherarg
 
-$LicenseInfo:firstyear=2009&license=internal$
+$LicenseInfo:firstyear=2009&license=viewergpl$
 Copyright (c) 2009, Linden Research, Inc.
 $/LicenseInfo$
 """
diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py
index 9daab34803ef32a079ba7dae4213edd47a71c7fe..b8fe4971c5be3b2587eb37914bd5012da8104254 100644
--- a/indra/lib/python/indra/__init__.py
+++ b/indra/lib/python/indra/__init__.py
@@ -2,7 +2,7 @@
 @file __init__.py
 @brief Initialization file for the indra module.
 
-$LicenseInfo:firstyear=2006&license=internal$
+$LicenseInfo:firstyear=2006&license=viewergpl$
 
 Copyright (c) 2006-2009, Linden Research, Inc.
 
diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt
index c95c854b7c60b4108819410df5ea9cdded549c4d..0993b64b14781415b4de7a1b20488a7182487231 100644
--- a/indra/viewer_components/CMakeLists.txt
+++ b/indra/viewer_components/CMakeLists.txt
@@ -1,5 +1,4 @@
 # -*- cmake -*-
 
 add_subdirectory(login)
-add_subdirectory(eventhost)
 
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index 51f5cd0692096091278ffd60a99e1f6508c2a873..5a3c2053857597ee227e93365b4401d86ad79576 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -4,8 +4,31 @@
  * @date   2009-02-26
  * @brief  Tests of lllogin.cpp.
  * 
- * $LicenseInfo:firstyear=2009&license=internal$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
  * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("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://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://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,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */