Merging due to changes since my last pull.

1 files changed, 5 insertions, 17 deletions

diff --git a/indra/llprimitive/tests/llmessagesystem_stub.cpp b/indra/llprimitive/tests/llmessagesystem_stub.cpp
index 62504be3b0..8ca3c56022 100644
--- a/indra/llprimitive/tests/llmessagesystem_stub.cpp
+++ b/indra/llprimitive/tests/llmessagesystem_stub.cpp
@@ -1,23 +1,11 @@
-/**
+/** 
  * @file llmessagesystem_stub.cpp
- * @brief stub class to allow unit testing
  *
- * $LicenseInfo:firstyear=2008&license=internal$
- *
- * Copyright (c) 2008, Linden Research, Inc.
- *
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") { }
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement 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$
+ * $LicenseInfo:firstyear=2008&license=viewergpl$                               
+ * Copyright (c) 2008-2009, Linden Research, Inc.                               
+ * $/LicenseInfo$                                                               
  */
+
 #include "linden_common.h"
 
 char * _PREHASH_TextureEntry;