Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the issue of script limits floater popping up after it was closed

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-14 11:13:00 -04:00
parent 7aaef519d4
commit 56a6c91aac
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloaterscriptlimits.cpp
View File

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