diff options
| author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
| commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
| tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llpreviewscript.cpp | |
| parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
| parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index ce465927bb..31ea69a889 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -157,7 +157,7 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(LLScriptEdCore* editor_core) : LLFloater(LLSD()), mEditorCore(editor_core) { - buildFloater(this,"floater_script_search.xml", NULL); + buildFromFile("floater_script_search.xml"); sInstance = this; @@ -660,7 +660,7 @@ void LLScriptEdCore::onBtnDynamicHelp() if (!live_help_floater) { live_help_floater = new LLFloater(LLSD()); - LLFloater::buildFloater(live_help_floater, "floater_lsl_guide.xml", NULL); + live_help_floater->buildFromFile("floater_lsl_guide.xml", NULL); LLFloater* parent = dynamic_cast<LLFloater*>(getParent()); llassert(parent); if (parent) |