diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index b0552fb6e2b0bd583be8ab8f5f705d2edbaa2db9..147f1de67b45526942ee5b3caae66c624586ca47 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -444,6 +444,9 @@ LLAgent::LLAgent() :
     mShowAvatar(TRUE),
     mFrameAgent(),
 
+    mIsAutoRespond(false),
+    mIsAutoRespondNonFriends(false),
+    
     mIsDoNotDisturb(false),
     mIsRejectTeleportOffers(false),
     mIgnorePrejump(FALSE),
@@ -1800,6 +1803,42 @@ BOOL LLAgent::getRejectFriendshipRequests() const
     return mIsRejectFriendshipRequests;
 }
 
+//-----------------------------------------------------------------------------
+// setAutoRespond()
+//-----------------------------------------------------------------------------
+void LLAgent::setAutoRespond(bool pIsAutoRespond)
+{
+    LL_INFOS() << "Setting autorespond mode to " << pIsAutoRespond << LL_ENDL;
+    mIsAutoRespond = pIsAutoRespond;
+    gSavedPerAccountSettings.setBOOL("AlchemyAutoresponseEnable", pIsAutoRespond);
+}
+
+//-----------------------------------------------------------------------------
+// getAutoRespond()
+//-----------------------------------------------------------------------------
+bool LLAgent::getAutoRespond() const
+{
+    return mIsAutoRespond;
+}
+
+//-----------------------------------------------------------------------------
+// setAutoRespondNonFriends()
+//-----------------------------------------------------------------------------
+void LLAgent::setAutoRespondNonFriends(bool pIsAutoRespondNonFriends)
+{
+    LL_INFOS() << "Setting AutoRespondingNonFriends mode to " << pIsAutoRespondNonFriends << LL_ENDL;
+    mIsAutoRespondNonFriends = pIsAutoRespondNonFriends;
+    gSavedPerAccountSettings.setBOOL("AlchemyAutoresponseNotFriendEnable", pIsAutoRespondNonFriends);
+}
+
+//-----------------------------------------------------------------------------
+// getAutoRespondNonFriends()
+//-----------------------------------------------------------------------------
+bool LLAgent::getAutoRespondNonFriends() const
+{
+    return mIsAutoRespondNonFriends;
+}
+
 //-----------------------------------------------------------------------------
 // startAutoPilotGlobal()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 38727207afb1a0e63a15db594aa54d387b634d01..8095e34f3ff0d4149a33e42308c2008665c8bd5f 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -501,6 +501,18 @@ class LLAgent final : public LLOldEvents::LLObservable
 private:
     BOOL            mIsRejectFriendshipRequests;
 
+public:
+    void            setAutoRespond(bool pIsAutoRespond);
+    bool            getAutoRespond() const;
+private:
+    BOOL            mIsAutoRespond;
+
+public:
+    void            setAutoRespondNonFriends(bool pIsAutoRespondNonFriends);
+    bool            getAutoRespondNonFriends() const;
+private:
+    BOOL            mIsAutoRespondNonFriends;
+
     //--------------------------------------------------------------------
     // Grab
     //--------------------------------------------------------------------