diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
index 8eeab5902463d3e565a7f1c395c3b85da45a8d4f..babc1b87aacff355d1b4526eee3a27cf006255f8 100644
--- a/indra/llcommon/llregistry.h
+++ b/indra/llcommon/llregistry.h
@@ -36,6 +36,8 @@
 template <typename T>
 struct LLRegistryDefaultComparator
 {
+	// It would be Bad if this comparison were used for const char*
+	BOOST_STATIC_ASSERT(! (boost::is_same<typename boost::remove_const<typename boost::remove_pointer<T>::type>::type, char>::value));
 	bool operator()(const T& lhs, const T& rhs) const { return lhs < rhs; }
 };