summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 13:00:18 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 13:00:18 +0000
commitca1e4d99a21e7445aede214a8faf6d631749d65b (patch)
tree2c7c96d811db93512d3f73b5115144206512189e /indra
parentd74fe63645242648d2ff972364b0531a67f58c7b (diff)
CID-81
Checker: FORWARD_NULL Function: LLScriptEdCore::onBtnDynamicHelp() File: /indra/newview/llpreviewscript.cpp
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpreviewscript.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index a8feaf690d..3221745fa3 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -661,7 +661,9 @@ void LLScriptEdCore::onBtnDynamicHelp()
live_help_floater = new LLFloater(LLSD());
LLUICtrlFactory::getInstance()->buildFloater(live_help_floater, "floater_lsl_guide.xml", NULL);
LLFloater* parent = dynamic_cast<LLFloater*>(getParent());
- parent->addDependentFloater(live_help_floater, TRUE);
+ llassert(parent);
+ if (parent)
+ parent->addDependentFloater(live_help_floater, TRUE);
live_help_floater->childSetCommitCallback("lock_check", onCheckLock, this);
live_help_floater->childSetValue("lock_check", gSavedSettings.getBOOL("ScriptHelpFollowsCursor"));
live_help_floater->childSetCommitCallback("history_combo", onHelpComboCommit, this);