Fix for etch build. Q and I both fixed LLDate by adding an operator!=() but we did it different ways so the two changes didn't cause a commit collision. I'm removing mine in favor of Q's.

2 files changed, 0 insertions, 8 deletions

diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index ff1b6c5334..3e0b9e7864 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -237,11 +237,6 @@ void LLDate::secondsSinceEpoch(F64 seconds)
 	mSecondsSinceEpoch = seconds;
 }
 
-bool operator!=(const LLDate& first, const LLDate& second)
-{
-	return (first.secondsSinceEpoch() != second.secondsSinceEpoch());
-}
-
 /* static */ LLDate LLDate::now()
 {
 	// time() returns seconds, we want fractions of a second, which LLTimer provides --RN
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h
index b660f9fcdd..b853196f71 100644
--- a/indra/llcommon/lldate.h
+++ b/indra/llcommon/lldate.h
@@ -143,9 +143,6 @@ private:
 	F64 mSecondsSinceEpoch;
 };
 
-// this operator required for tut
-bool operator!=(const LLDate& first, const LLDate& second);
-
 // Helper function to stream out a date
 std::ostream& operator<<(std::ostream& s, const LLDate& date);