From 8d355994925db166f22e0e1f6cb0e53f6dc2e215 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 22 Nov 2016 16:40:22 +0100
Subject: [PATCH] FIRE-20370: Crash boom bang fix

---
 indra/newview/llfavoritesbar.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index cc159386f7..ee4cec2a09 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -156,13 +156,14 @@ public:
 		if (mRetries <= MAX_LANDMARK_REQUEST_RETRIES)
 		{
 			requestNameAndPos();
-			return FALSE;
 		}
 		else
 		{
 			mIsFailed = true;
-			return TRUE;
+			mEventTimer.stop();
 		}
+
+		return FALSE;
 	}
 	// </FS:Ansariel>