Merge branch 'develop' into marchcat/xcode-16

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h
index 4ae73a0c43..54b757d217 100644
--- a/indra/newview/llchatitemscontainerctrl.h
+++ b/indra/newview/llchatitemscontainerctrl.h
@@ -48,7 +48,8 @@ protected:
         LLFloaterIMNearbyChatToastPanel()
         :
     mIsDirty(false),
-    mSourceType(CHAT_SOURCE_OBJECT)
+    mSourceType(CHAT_SOURCE_OBJECT),
+    mIsFromScript(false)
     {};
 public:
     ~LLFloaterIMNearbyChatToastPanel(){}
@@ -58,6 +59,8 @@ public:
     const LLUUID& getFromID() const { return mFromID;}
     const std::string& getFromName() const { return mFromName; }
 
+    bool isFromScript() { return mIsFromScript; }
+
     //void  addText     (const std::string& message ,  const LLStyle::Params& input_params = LLStyle::Params());
     //void  setMessage  (const LLChat& msg);
     void    snapToMessageHeight ();
@@ -88,6 +91,7 @@ private:
     std::string     mFromName;
     EChatSourceType mSourceType;
     LLChatMsgBox*   mMsgText;
+    bool mIsFromScript;