From f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Wed, 13 Jun 2007 18:02:37 +0000
Subject: result of merge manually performed through diff and patch. svn diff
 svn+ssh://svn/svn/linden/release@63615
 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in
 release

---
 indra/llcommon/llframetimer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llcommon/llframetimer.cpp')

diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index fca2bd2e85..2505295143 100644
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -50,6 +50,12 @@ void LLFrameTimer::reset()
 	mExpiry = sFrameTime;
 }
 
+void LLFrameTimer::resetWithExpiry(F32 expiration)
+{
+	reset();
+	setTimerExpirySec(expiration);
+}
+
 // Don't combine pause/unpause with start/stop
 // Useage:
 //  LLFrameTime foo; // starts automatically
-- 
cgit v1.3