diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
| commit | 01561ea13ab5741aee70b8873d81078bafb55b86 (patch) | |
| tree | 2c1267e05ccab296525ad1dea469a60560c37a30 /indra/newview/llpreviewscript.cpp | |
| parent | e747e9a3da3166de88dea1af213a36694135b820 (diff) | |
| parent | 69bed1f123f35b6124f4e3255df156b7fe82418b (diff) | |
merge from remote repo
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); |