diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
| commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
| tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/newview/llviewermenu.cpp | |
| parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
| parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) | |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index daeace0ec5..e1ce0b384a 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7262,7 +7262,7 @@ void handle_load_from_xml(void*) { std::string filename = picker.getFirstFile(); LLFloater* floater = new LLFloater(LLSD()); - LLUICtrlFactory::getInstance()->buildFloater(floater, filename, NULL); + floater->buildFromFile(filename); } } |