diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 17:30:23 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 17:30:23 +0000 |
| commit | 38036b841291a19f36bd7a5d341c60482bb0351b (patch) | |
| tree | 888be4da6ef593230bffe730c45740c0bd4cfa85 /indra/newview | |
| parent | ed116da1311b281bcd815d9d3f95c1aecf67207d (diff) | |
CID-210
Checker: REVERSE_INULL
Function: LLFloaterGodTools::processRegionInfo(LLMessageSystem *)
File: /indra/newview/llfloatergodtools.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatergodtools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 5294f09e64..eb56f387cd 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -213,6 +213,9 @@ void LLFloaterGodTools::showPanel(const std::string& panel_name) // static void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) { + llassert(msg); + if (!msg) return; + LLHost host = msg->getSender(); if (host != gAgent.getRegionHost()) { @@ -270,8 +273,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) if ( gAgent.isGodlike() && LLFloaterReg::instanceVisible("god_tools") && god_tools->mPanelRegionTools - && god_tools->mPanelObjectTools - && msg ) + && god_tools->mPanelObjectTools) { LLPanelRegionTools* rtool = god_tools->mPanelRegionTools; god_tools->mCurrentHost = host; |