revived some deleted files to get mac build working

3 files changed, 132 insertions, 1 deletions

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index cc54524320..5856e06b67 100755
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -174,7 +174,7 @@ set(llcommon_HEADER_FILES
     llmetrics.h
     llmetricperformancetester.h
     llmortician.h
-    llmutex.h
+    llnametable.h
     llpointer.h
     llpredicate.h
     llpreprocessor.h
diff --git a/indra/llcommon/llnametable.h b/indra/llcommon/llnametable.h
new file mode 100644
index 0000000000..d3283543f3
--- /dev/null
+++ b/indra/llcommon/llnametable.h
@@ -0,0 +1,105 @@
+/** 
+ * @file llnametable.h
+ * @brief LLNameTable class is a table to associate pointers with string names
+ *
+ * $LicenseInfo:firstyear=2000&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * 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.
+ * 
+ * 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.
+ * 
+ * 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
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLNAMETABLE_H
+#define LL_LLNAMETABLE_H
+
+#include <map>
+
+#include "string_table.h"
+
+template <class DATA>
+class LLNameTable
+{
+public:
+	LLNameTable()
+	:	mNameMap()
+	{
+	}
+
+	~LLNameTable() 
+	{ 
+	}
+
+	void addEntry(const std::string& name, DATA data)
+	{
+		addEntry(name.c_str(), data);
+	}
+
+	void addEntry(const char *name, DATA data)
+	{
+		char *tablename = gStringTable.addString(name);
+		mNameMap[tablename] = data;
+	}
+
+	BOOL checkName(const std::string& name) const
+	{
+		return checkName(name.c_str());
+	}
+
+	// "logically const" even though it modifies the global nametable
+	BOOL checkName(const char *name) const
+	{
+		char *tablename = gStringTable.addString(name);
+		return mNameMap.count(tablename) ? TRUE : FALSE;
+	}
+
+	DATA resolveName(const std::string& name) const
+	{
+		return resolveName(name.c_str());
+	}
+
+	// "logically const" even though it modifies the global nametable
+	DATA resolveName(const char *name) const
+	{
+		char *tablename = gStringTable.addString(name);
+		const_iter_t iter = mNameMap.find(tablename);
+		if (iter != mNameMap.end())
+			return iter->second;
+		else
+			return 0;
+	}
+
+	// O(N)! (currently only used in one place... (newsim/llstate.cpp))
+	const char *resolveData(const DATA &data) const
+	{
+		const_iter_t iter = mNameMap.begin();
+		const_iter_t end = mNameMap.end();
+		for (; iter != end; ++iter)
+		{
+			if (iter->second == data)
+				return iter->first;
+		}
+   		return NULL;
+	}		
+
+	typedef std::map<const char *, DATA> name_map_t;
+	typedef typename std::map<const char *,DATA>::iterator iter_t;
+	typedef typename std::map<const char *,DATA>::const_iterator const_iter_t;
+	name_map_t		mNameMap;
+};
+
+#endif
diff --git a/indra/llcommon/string_table.h b/indra/llcommon/string_table.h
new file mode 100644
index 0000000000..fe6416fb50
--- /dev/null
+++ b/indra/llcommon/string_table.h
@@ -0,0 +1,26 @@
+/** 
+ * @file string_table.h
+ * @brief Legacy wrapper header.
+ *
+ * $LicenseInfo:firstyear=2000&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * 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.
+ * 
+ * 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.
+ * 
+ * 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
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#include "llstringtable.h"