1 files changed, 26 insertions, 31 deletions

diff --git a/indra/lscript/lscript_compile/lscript_scope.h b/indra/lscript/lscript_compile/lscript_scope.h
index c55d99577a..5b2a73ad92 100644
--- a/indra/lscript/lscript_compile/lscript_scope.h
+++ b/indra/lscript/lscript_compile/lscript_scope.h
@@ -2,30 +2,25 @@
  * @file lscript_scope.h
  * @brief builds nametable and checks scope
  *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2007, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * 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://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -277,14 +272,14 @@ public:
 class LLScriptScopeEntry
 {
 public:
-	LLScriptScopeEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
+	LLScriptScopeEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
 		: mIdentifier(identifier), mIDType(idtype), mType(type), mOffset(0), mSize(0), mAssignable(NULL), mCount(count), mLibraryNumber(0)
 	{
 	}
 
 	~LLScriptScopeEntry() {}
 
-	char						*mIdentifier;
+	const char					*mIdentifier;
 	LSCRIPTIdentifierType		mIDType;
 	LSCRIPTType					mType;
 	S32							mOffset;
@@ -309,9 +304,9 @@ public:
 		mEntryMap.deleteAllData();
 	}
 
-	LLScriptScopeEntry *addEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
+	LLScriptScopeEntry *addEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (!mEntryMap.checkData(name))
 		{
 			if (idtype == LIT_FUNCTION)
@@ -329,9 +324,9 @@ public:
 		}
 	}
 
-	BOOL checkEntry(char *identifier)
+	BOOL checkEntry(const char *identifier)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (mEntryMap.checkData(name))
 		{
 			return TRUE;
@@ -343,9 +338,9 @@ public:
 		}
 	}
 
-	LLScriptScopeEntry *findEntry(char *identifier)
+	LLScriptScopeEntry *findEntry(const char *identifier)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -360,9 +355,9 @@ public:
 		return NULL;
 	}
 
-	LLScriptScopeEntry *findEntryTyped(char *identifier, LSCRIPTIdentifierType idtype)
+	LLScriptScopeEntry *findEntryTyped(const char *identifier, LSCRIPTIdentifierType idtype)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -397,7 +392,7 @@ public:
 		mParentScope = scope;
 	}
 
-	LLMap<char *, LLScriptScopeEntry *>	mEntryMap;
+	LLMap<const char *, LLScriptScopeEntry *>	mEntryMap;
 	LLScriptScope						*mParentScope;
 	LLStringTable						*mSTable;
 	S32									mFunctionCount;