Alchemy llcharacter and llcommon merge pass.

2017-03-31 02:08:03 -05:00
parent f95be54bd5
commit 1230748ef5
61 changed files with 301 additions and 304 deletions
--- a/indra/llcommon/llstaticstringtable.h
+++ b/indra/llcommon/llstaticstringtable.h
@@ -45,7 +45,7 @@ public:
 	const std::string&	String() const { return string;		}
 	size_t				Hash()	 const { return string_hash;  }

-	bool operator==(const LLStaticHashedString& b) const { return String() == b.String(); }
+	bool operator==(const LLStaticHashedString& b) const { return Hash() == b.Hash(); }

 protected: