From a4e94cbfad608c1edb6aa2b9b9dea33c60f8328d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 12 Apr 2021 21:01:26 +0200
Subject: [PATCH] Get rid of pointless mInstance member in area search that
 fortunately wasn't used for instance checking

---
 indra/newview/fsareasearch.cpp | 10 +++-------
 indra/newview/fsareasearch.h   | 12 ++++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp
index c538809a82..a23c14ab6f 100644
--- a/indra/newview/fsareasearch.cpp
+++ b/indra/newview/fsareasearch.cpp
@@ -166,8 +166,6 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
 	mRequestNeedsSent(false),
 	mRlvBehaviorCallbackConnection()
 {
-	mInstance = this;
-
 	mFactoryMap["area_search_list_panel"] = LLCallbackMap(createPanelList, this);
 	mFactoryMap["area_search_find_panel"] = LLCallbackMap(createPanelFind, this);
 	mFactoryMap["area_search_filter_panel"] = LLCallbackMap(createPanelFilter, this);
@@ -319,7 +317,7 @@ void FSAreaSearch::updateRlvRestrictions(ERlvBehaviour behavior)
 
 void FSAreaSearch::checkRegion()
 {
-	if (mInstance && mActive)
+	if (mActive)
 	{
 		// Check if we changed region, and if we did, clear the object details cache.
 		LLViewerRegion* region = gAgent.getRegion(); // getRegion can return NULL if disconnected.
@@ -688,8 +686,7 @@ void FSAreaSearch::requestObjectProperties(const std::vector<U32>& request_list,
 
 void FSAreaSearch::processObjectProperties(LLMessageSystem* msg)
 {
-	// This function is called by llviewermessage even if no floater has been created.
-	if (!(mInstance && mActive))
+	if (!mActive)
 	{
 		return;
 	}
@@ -1109,8 +1106,7 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje
 
 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 LLViewerObjectList::fetchObjectCostsCoro even if no floater has been created.
-	if (!(mInstance && mActive))
+	if (!mActive)
 	{
 		return;
 	}
diff --git a/indra/newview/fsareasearch.h b/indra/newview/fsareasearch.h
index ed2c9af136..a25869642a 100644
--- a/indra/newview/fsareasearch.h
+++ b/indra/newview/fsareasearch.h
@@ -28,15 +28,15 @@
 #ifndef FS_AREASEARCH_H
 #define FS_AREASEARCH_H
 
+#include "llcategory.h"
 #include "llfloater.h"
 #include "llframetimer.h"
-#include "llsaleinfo.h"
-#include "llcategory.h"
 #include "llpermissions.h"
-#include "llviewerobject.h"
-#include <boost/regex.hpp>
+#include "llsaleinfo.h"
 #include "llscrolllistcolumn.h"
+#include "llviewerobject.h"
 #include "rlvdefines.h"
+#include <boost/regex.hpp>
 
 class LLAvatarName;
 class LLTextBox;
@@ -219,10 +219,6 @@ private:
 	friend class FSParcelChangeObserver;
 	FSParcelChangeObserver*	mParcelChangedObserver;
 
-	// Used for checking to see if a floater has been created.
-	// Can not be trusted as a singleton pointer, don't use as a pointer.
-	FSAreaSearch* mInstance;
-
 	LLTabContainer* mTab;
 	FSPanelAreaSearchList* mPanelList;
 	FSPanelAreaSearchFind* mPanelFind;