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.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index c7c1c50c7b..da777e4ee6 100644
--- a/indra/llcommon/llframetimer.h
+++ b/indra/llcommon/llframetimer.h
@@ -55,6 +55,7 @@ public:
 	void start();
 	void stop();
 	void reset();
+	void resetWithExpiry(F32 expiration);
 	void pause();
 	void unpause();
 	void setTimerExpirySec(F32 expiration);
-- 
cgit v1.2.3