2 files changed, 5 insertions, 4 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 7ef7d101db..55187d8325 100755
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -212,8 +212,11 @@ private:
 	}
 	void remove_()
 	{
-        if (getMap_().find(mInstanceKey) != getMap_().end())
-		getMap_().erase(mInstanceKey);
+		typename InstanceMap::iterator iter = getMap_().find(mInstanceKey);
+		if (iter != getMap_().end())
+		{
+			getMap_().erase(iter);
+		}
 	}
 
 private:
diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h
index efa66390e8..926ce32d75 100755
--- a/indra/llcommon/lllslconstants.h
+++ b/indra/llcommon/lllslconstants.h
@@ -208,8 +208,6 @@ const S32 OBJECT_PHYSICS = 21;
 const S32 OBJECT_PHANTOM = 22;
 const S32 OBJECT_TEMP_ON_REZ = 23;
 const S32 OBJECT_RENDER_WEIGHT = 24;
-const S32 OBJECT_ATTACHMENT_GEOMETRY_BYTES = 25;
-const S32 OBJECT_ATTACHMENT_SURFACE_AREA = 26;
 
 // llTextBox() magic token string - yes this is a hack.  sue me.
 char const* const TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!";