From 56a6c91aac8e17929d92683a41803b6e35d955ec Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Wed, 14 Aug 2013 11:13:00 -0400
Subject: [PATCH] Fix the issue of script limits floater popping up after it
 was closed

---
 indra/newview/llfloaterscriptlimits.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index 84c2ff953..e7bf31312 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -208,7 +208,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content)
 	}
 	else
 	{
-		LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+		LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 		if(!instance)
 		{
 			llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
@@ -282,7 +282,7 @@ void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
 
 #endif
 
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 	if(!instance)
 	{
 		llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
@@ -390,7 +390,7 @@ result (map)
 
 #endif
 
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 
 	if(!instance)
 	{
@@ -478,7 +478,7 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
 
 #endif
 
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 
 	if(!instance)
 	{
@@ -961,7 +961,7 @@ void LLPanelScriptLimitsRegionMemory::clearList()
 // static
 void LLPanelScriptLimitsRegionMemory::onClickRefresh(void* userdata)
 {
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 	if(instance)
 	{
 		LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");
@@ -1016,7 +1016,7 @@ void LLPanelScriptLimitsRegionMemory::showBeacon()
 // static
 void LLPanelScriptLimitsRegionMemory::onClickHighlight(void* userdata)
 {
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 	if(instance)
 	{
 		LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");
@@ -1121,7 +1121,7 @@ void LLPanelScriptLimitsRegionMemory::returnObjects()
 // static
 void LLPanelScriptLimitsRegionMemory::onClickReturn(void* userdata)
 {
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 	if(instance)
 	{
 		LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");
@@ -1319,7 +1319,7 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content)
 // static
 void LLPanelScriptLimitsAttachment::onClickRefresh(void* userdata)
 {
-	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::getInstance();
+	LLFloaterScriptLimits* instance = LLFloaterScriptLimits::findInstance();
 	if(instance)
 	{
 		LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");