diff options
| author | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
| commit | 0399d49e52d16c4335a933ac8d8f2ae251aeec6d (patch) | |
| tree | f7d80e317e3f2c0bcab7efc1117df403cb1f2af0 /indra/newview/llviewermenu.cpp | |
| parent | 7dce65a5db84988b2cab3d9c977a86c08124701c (diff) | |
| parent | 98bcaa1071ac4fb0b98a719c7fc7bdb3682dae4c (diff) | |
merge
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 2a72e255d0..141d7d6b86 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7255,7 +7255,7 @@ void handle_load_from_xml(void*) { std::string filename = picker.getFirstFile(); LLFloater* floater = new LLFloater(LLSD()); - LLUICtrlFactory::getInstance()->buildFloater(floater, filename, NULL); + LLFloater::buildFloater(floater, filename, NULL); } } |