merge

--HG--
branch : product-engine

1 files changed, 16 insertions, 0 deletions

diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 33ef4c81cd..0fb438bfe9 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -277,6 +277,13 @@ public:
 	static bool canSpawnIMSession(const LLNotificationPtr& notification);
 
 	/**
+	 * Checks if passed notification can create IM session and be written into it.
+	 *
+	 * This method uses canLogToIM() & canSpawnIMSession().
+	 */
+	static bool canSpawnSessionAndLogToIM(const LLNotificationPtr& notification);
+
+	/**
 	 * Writes notification message to IM session.
 	 */
 	static void logToIM(const EInstantMessage& session_type,
@@ -303,6 +310,15 @@ public:
 	 * Spawns IM session.
 	 */
 	static void spawnIMSession(const std::string& name, const LLUUID& from_id);
+
+	/**
+	 * Returns name from the notification's substitution.
+	 *
+	 * Methods gets "NAME" or "[NAME]" from the substitution map.
+	 *
+	 * @param notification - Notification which substitution's name will be returned.
+	 */
+	static std::string getSubstitutionName(const LLNotificationPtr& notification);
 };
 
 }