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

Fix crash signature 608

Browse Source 
This was a crash in LLPanelDirClassified::postBuild(), on the line changed here, probably accessng null pointer.
There are probably a few other signatures for this in our database.
This commit is contained in:
Inusaito Sayori
2014-09-02 10:53:36 -04:00
parent 0b384bdd72
commit 74704d0d2a
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpaneldirclassified.cpp
View File

@@ -119,7 +119,8 @@ BOOL LLPanelDirClassified::postBuild()
// Don't do this every time we open find, it's expensive; require clicking 'search' // Don't do this every time we open find, it's expensive; require clicking 'search'
//requestClassified(); //requestClassified();
childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_CLASSIFIEDS)); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (region->getGamingFlags() & REGION_GAMING_PRESENT) && !(region->getGamingFlags() & REGION_GAMING_HIDE_FIND_CLASSIFIEDS));
return TRUE; return TRUE;
} }

3
indra/newview/llpaneldirevents.cpp
View File

@@ -93,7 +93,8 @@ BOOL LLPanelDirEvents::postBuild()
} }
gDisplayEventHack = FALSE; gDisplayEventHack = FALSE;
childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS)); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS));
return TRUE; return TRUE;
} }

5
indra/newview/llpaneldirfind.cpp
View File

@@ -250,7 +250,10 @@ BOOL LLPanelDirFind::postBuild()
} }
if (LLUICtrl* ctrl = findChild<LLUICtrl>("filter_gaming")) if (LLUICtrl* ctrl = findChild<LLUICtrl>("filter_gaming"))
ctrl->setVisible(gAgent.getRegion() && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_ALL)); {
const LLViewerRegion* region(gAgent.getRegion());
ctrl->setVisible(region && (region->getGamingFlags() & REGION_GAMING_PRESENT) && !(region->getGamingFlags() & REGION_GAMING_HIDE_FIND_ALL));
}
return TRUE; return TRUE;
} }

3
indra/newview/llpaneldirgroups.cpp
View File

@@ -61,7 +61,8 @@ BOOL LLPanelDirGroups::postBuild()
childDisable("Search"); childDisable("Search");
setDefaultBtn( "Search" ); setDefaultBtn( "Search" );
childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_GROUPS)); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (region->getGamingFlags() & REGION_GAMING_PRESENT) && !(region->getGamingFlags() & REGION_GAMING_HIDE_FIND_GROUPS));
return TRUE; return TRUE;
} }

3
indra/newview/llpaneldirland.cpp
View File

@@ -126,7 +126,8 @@ BOOL LLPanelDirLand::postBuild()
} }
} }
childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_LAND)); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (region->getGamingFlags() & REGION_GAMING_PRESENT) && !(region->getGamingFlags() & REGION_GAMING_HIDE_FIND_LAND));
return TRUE; return TRUE;
} }

3
indra/newview/llpaneldirplaces.cpp
View File

@@ -99,7 +99,8 @@ BOOL LLPanelDirPlaces::postBuild()
childSetEnabled("Category", true); childSetEnabled("Category", true);
} }
childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_SIMS)); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (region->getGamingFlags() & REGION_GAMING_PRESENT) && !(region->getGamingFlags() & REGION_GAMING_HIDE_FIND_SIMS));
// Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC // Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC
// initialQuery(); // initialQuery();