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/llui/llfloaterreg.cpp | |
| parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
| parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) | |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index ccffe98c96..4c975011df 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -121,7 +121,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) res = build_func(key); - bool success = LLUICtrlFactory::getInstance()->buildFloater(res, xui_file, NULL); + bool success = res->buildFromFile(xui_file, NULL); if (!success) { llwarns << "Failed to build floater type: '" << name << "'." << llendl; |