diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
| commit | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch) | |
| tree | 2c5bacebcb27b78d318b6e162334488f6e515974 /indra/newview/llpreviewscript.cpp | |
| parent | b7f8a2479249646c7fb38ead195d5197ab733c94 (diff) | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
merge up to 3.4.4
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 2 |
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) |