diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 15:07:37 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 15:07:37 +0000 |
| commit | 15ff4379e53eb5b3ed914c46c0051c3926de1ecb (patch) | |
| tree | f16087fcddedb2a4e19f1f24b24de9e3c257d5b0 /indra/newview/llpreviewscript.cpp | |
| parent | 19962a783365784e3b820521e5854fdaf217133c (diff) | |
| parent | f023d238292332b6ed72d95af5e7381ce1f55fc4 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 4 |
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); |