merge changes for 5.0.9-release

1 files changed, 14 insertions, 1 deletions

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index b2c450aa0c..da912ef3d4 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -349,8 +349,8 @@ void LLScriptFloater::hideToastsIfNeeded()
 //////////////////////////////////////////////////////////////////////////
 
 LLScriptFloaterManager::LLScriptFloaterManager()
+		: mDialogLimitationsSlot()
 {
-	gSavedSettings.getControl("ScriptDialogLimitations")->getCommitSignal()->connect(boost::bind(&clearScriptNotifications));
 }
 
 void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
@@ -361,6 +361,19 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 		return;
 	}
 
+	if (!mDialogLimitationsSlot.connected())
+	{
+		LLPointer<LLControlVariable> cntrl_ptr = gSavedSettings.getControl("ScriptDialogLimitations");
+		if (cntrl_ptr.notNull())
+		{
+			mDialogLimitationsSlot = cntrl_ptr->getCommitSignal()->connect(boost::bind(&clearScriptNotifications));
+		}
+		else
+		{
+			LL_WARNS() << "Unable to set signal on setting 'ScriptDialogLimitations'" << LL_ENDL;
+		}
+	}
+
 	// get scripted Object's ID
 	LLUUID object_id = notification_id_to_object_id(notification_id);