From 338f4e2b787660a71073de040404b0d1416b9b4c Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 6 Dec 2013 17:43:06 -0700
Subject: [PATCH] FIRE-11617: Import fix from Cron Stardust. - Verify that the
 area search floater was active before processing logic.

---
 indra/newview/fsareasearch.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp
index 9c7c53bfda..35c245fd86 100644
--- a/indra/newview/fsareasearch.cpp
+++ b/indra/newview/fsareasearch.cpp
@@ -1053,6 +1053,12 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje
 // <FS:Cron> Allows the object costs to be updated on-the-fly so as to bypass the problem with the data being stale when first accessed.
 void FSAreaSearch::updateObjectCosts(const LLUUID& object_id, F32 object_cost, F32 link_cost, F32 physics_cost, F32 link_physics_cost)
 {
+	// This fuction is called by LLObjectCostResponder::result even if no floater has been created.
+	if (!(mInstance && mActive))
+	{
+		return;
+	}
+	
 	LLScrollListCtrl* result_list = mPanelList->getResultList();
 	if (result_list)
 	{