Merge branch 'master' of git://github.com/siana/SingularityViewer.git

2011-05-20 12:38:36 -05:00
parent 1a2d75fbe6 1327c80dd7
commit cf6668cb7a
10 changed files with 31 additions and 12 deletions
--- a/indra/llui/llfunctorregistry.h
+++ b/indra/llui/llfunctorregistry.h
@@ -75,7 +75,6 @@ public:
 	bool registerFunctor(const std::string& name, ResponseFunctor f)
 	{
 		bool retval = true;
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) == 0)
 		{
 			mMap[name] = f;
@@ -102,7 +101,6 @@ public:

 	FUNCTOR_TYPE getFunctor(const std::string& name)
 	{
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) != 0)
 		{
 			return mMap[name];