diff --git a/indra/newview/statemachine/CMakeLists.txt b/indra/newview/statemachine/CMakeLists.txt
index a95431b0f..86f19107e 100644
--- a/indra/newview/statemachine/CMakeLists.txt
+++ b/indra/newview/statemachine/CMakeLists.txt
@@ -39,6 +39,7 @@ set(statemachine_SOURCE_FILES
     aifilepicker.cpp
     aifetchinventoryfolder.cpp
     aievent.cpp
+    aitimer.cpp
     )
 
 set(statemachine_HEADER_FILES
@@ -48,6 +49,7 @@ set(statemachine_HEADER_FILES
     aidirpicker.h
     aifetchinventoryfolder.h
     aievent.h
+    aitimer.h
     )
 
 set_source_files_properties(${statemachine_HEADER_FILES}
diff --git a/indra/newview/statemachine/aitimer.cpp b/indra/newview/statemachine/aitimer.cpp
new file mode 100644
index 000000000..5a37a6991
--- /dev/null
+++ b/indra/newview/statemachine/aitimer.cpp
@@ -0,0 +1,96 @@
+/**
+ * @file aitimer.cpp
+ * @brief Implementation of AITimer
+ *
+ * Copyright (c) 2012, Aleric Inglewood.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   07/02/2012
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#include "linden_common.h"
+#include "aitimer.h"
+
+enum timer_state_type {
+  AITimer_start = AIStateMachine::max_state,
+  AITimer_expired
+};
+
+char const* AITimer::state_str_impl(state_type run_state) const
+{
+  switch(run_state)
+  {
+	AI_CASE_RETURN(AITimer_start);
+	AI_CASE_RETURN(AITimer_expired);
+  }
+  return "UNKNOWN STATE";
+}
+
+void AITimer::initialize_impl(void)
+{
+  llassert(!mFrameTimer.isRunning());
+  set_state(AITimer_start);
+}
+
+void AITimer::expired(void)
+{
+  set_state(AITimer_expired);
+}
+
+void AITimer::multiplex_impl(void)
+{
+  switch (mRunState)
+  {
+	case AITimer_start:
+	{
+	  mFrameTimer.create(mInterval, boost::bind(&AITimer::expired, this));
+	  idle();
+	  break;
+	}
+	case AITimer_expired:
+	{
+	  finish();
+	  break;
+	}
+  }
+}
+
+void AITimer::abort_impl(void)
+{
+  mFrameTimer.cancel();
+}
+
+void AITimer::finish_impl(void)
+{
+  // Kill object by default.
+  // This can be overridden by calling run() from the callback function.
+  kill();
+}
+
+void AIPersistentTimer::finish_impl(void)
+{
+  // Don't kill object by default.
+  if (aborted())
+	kill();
+  // Callback function should always call kill() or run().
+}
diff --git a/indra/newview/statemachine/aitimer.h b/indra/newview/statemachine/aitimer.h
new file mode 100644
index 000000000..06d3e2ef4
--- /dev/null
+++ b/indra/newview/statemachine/aitimer.h
@@ -0,0 +1,118 @@
+/**
+ * @file aitimer.h
+ * @brief Generate a timer event
+ *
+ * Copyright (c) 2012, Aleric Inglewood.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   07/02/2012
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#ifndef AITIMER_H
+#define AITIMER_H
+
+#include "aistatemachine.h"
+#include "aiframetimer.h"
+
+// A timer state machine.
+//
+// Before calling run(), call setInterval() to pass needed parameters.
+//
+// When the state machine finishes it calls the callback, use parameter _1,
+// (success) to check whether or not the statemachine actually timed out or
+// was cancelled. The boolean is true when it expired and false if the
+// state machine was aborted.
+//
+// Objects of this type can be reused multiple times, see
+// also the documentation of AIStateMachine.
+//
+// Typical usage:
+//
+// AITimer* timer = new AITimer;
+//
+// timer->setInterval(5.5);		// 5.5 seconds time out interval.
+// timer->run(...);				// Start timer and pass callback; see AIStateMachine.
+//
+// The default behavior is to call the callback and then delete the AITimer object.
+// One can call run() again from the callback function to get a repeating expiration.
+// You can call run(...) with parameters too, but using run() without parameters will
+// just reuse the old ones (call the same callback).
+//
+class AITimer : public AIStateMachine {
+  private:
+	AIFrameTimer mFrameTimer;		//!< The actual timer that this object wraps.
+	F64 mInterval;					//!< Input variable: interval after which the event will be generated, in seconds.
+
+  public:
+	AITimer(void) : mInterval(0) { DoutEntering(dc::statemachine, "AITimer(void) [" << (void*)this << "]"); }
+
+	/**
+	 * @brief Set the interval after which the timer should expire.
+	 *
+	 * @param interval Amount of time in seconds before the timer will expire.
+	 * @param True if the timer should be deleted after it expires; false means it will keep firing at regular intervals.
+	 *
+	 * Call abort() at any time to stop the timer (and delete the AITimer object).
+	 */
+	void setInterval(F64 interval) { mInterval = interval; }
+
+	/**
+	 * @brief Get the expiration interval.
+	 *
+	 * @returns expiration interval in seconds.
+	 */
+	F64 getInterval(void) const { return mInterval; }
+
+  protected:
+	// Call finish() (or abort()), not delete.
+	/*virtual*/ ~AITimer() { DoutEntering(dc::statemachine, "~AITimer() [" << (void*)this << "]"); mFrameTimer.cancel(); }
+
+	// Handle initializing the object.
+	/*virtual*/ void initialize_impl(void);
+
+	// Handle mRunState.
+	/*virtual*/ void multiplex_impl(void);
+
+	// Handle aborting from current bs_run state.
+	/*virtual*/ void abort_impl(void);
+
+	// Handle cleaning up from initialization (or post abort) state.
+	/*virtual*/ void finish_impl(void);
+
+	// Implemenation of state_str for run states.
+	/*virtual*/ char const* state_str_impl(state_type run_state) const;
+
+  private:
+	// This is the callback for mFrameTimer.
+	void expired(void);
+};
+
+// Same as above but does not delete itself automatically by default after use.
+// Call kill() on it yourself (from the callback function) when you're done with it!
+class AIPersistentTimer : public AITimer {
+  protected:
+	// Handle cleaning up from initialization (or post abort) state.
+	/*virtual*/ void finish_impl(void);
+};
+
+#endif