summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-03 14:35:45 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-03 14:35:45 -0500
commit3be13024c51a714aa94ac55c2a972d3f523024f9 (patch)
treeb9c5c477da9ca20a9cf4e202bad84a5105a33a4a /indra/newview/llpreviewscript.cpp
parent5c245e941ace3f52dfa3539c473e2c02f207d8a3 (diff)
parentf0a11b1590a8d52281683275f836ac347ccc510f (diff)
merge
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rw-r--r--indra/newview/llpreviewscript.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 88727bf59b..9c25e69db0 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -815,7 +815,7 @@ void LLScriptEdCore::onBtnDynamicHelp()
if (!live_help_floater)
{
live_help_floater = new LLFloater(LLSD());
- live_help_floater->buildFromFile("floater_lsl_guide.xml", NULL);
+ live_help_floater->buildFromFile("floater_lsl_guide.xml");
LLFloater* parent = dynamic_cast<LLFloater*>(getParent());
llassert(parent);
if (parent)