1 files changed, 16 insertions, 5 deletions

diff --git a/linden/indra/llmessage/lluseroperation.cpp b/linden/indra/llmessage/lluseroperation.cpp
index 29146ea..f43e02a 100644
--- a/linden/indra/llmessage/lluseroperation.cpp
+++ b/linden/indra/llmessage/lluseroperation.cpp
@@ -42,7 +42,8 @@ LLUserOperationMgr* gUserOperationMgr = NULL;
 
 LLUserOperation::LLUserOperation(const LLUUID& agent_id)
 :       mAgentID(agent_id),
-        mTimer()
+        mTimer(),
+        mNoExpire(FALSE)
 {
         mTransactionID.generate();
 }
@@ -51,14 +52,16 @@ LLUserOperation::LLUserOperation(const LLUUID& agent_id,
                                                                  const LLUUID& transaction_id) :
         mAgentID(agent_id),
         mTransactionID(transaction_id),
-        mTimer()
+        mTimer(),
+        mNoExpire(FALSE)
 {
 }
 
 // protected constructor which is used by base classes that determine
 // transaction, agent, et. after construction.
 LLUserOperation::LLUserOperation() :
-        mTimer()
+        mTimer(),
+        mNoExpire(FALSE)
 {
 }
 
@@ -66,11 +69,19 @@ LLUserOperation::~LLUserOperation()
 {
 }
 
+void LLUserOperation::SetNoExpireFlag(const BOOL flag)
+{
+        mNoExpire = flag;
+}
 
 BOOL LLUserOperation::isExpired()
 {
-        const F32 EXPIRE_TIME_SECS = 10.f;
-        return mTimer.getElapsedTimeF32() > EXPIRE_TIME_SECS;
+        if (!mNoExpire)
+        {
+                const F32 EXPIRE_TIME_SECS = 10.f;
+                return mTimer.getElapsedTimeF32() > EXPIRE_TIME_SECS;
+        }
+        return FALSE;
 }
 
 void LLUserOperation::expire()