diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
| commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
| tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/newview/llpreviewscript.cpp | |
| parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
merging in latest changes, resolved llimview.cpp conflict
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 29eb5ce69e..968a912ea2 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -819,7 +819,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) |