summaryrefslogtreecommitdiff
path: root/indra/llui/llfloaterreg.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-21 15:07:17 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-21 15:07:17 -0800
commitea0461c01287a2b026b5621616fb811bfc2d68a2 (patch)
treef1e94df52aa6f5a68f008278cbaec0eaca063a4a /indra/llui/llfloaterreg.cpp
parent76990fab4f3c73ab1b2051421c52444de28f9d32 (diff)
parenta830812172d7eb163c06ead3155dc4b43ded4346 (diff)
Pull and merge https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rw-r--r--indra/llui/llfloaterreg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index 9115eb7174..306caf2b91 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -154,7 +154,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key)
llwarns << "Failed to build floater type: '" << name << "'." << llendl;
return NULL;
}
- bool success = res->buildFromFile(xui_file, NULL);
+ bool success = res->buildFromFile(xui_file);
if (!success)
{
llwarns << "Failed to build floater type: '" << name << "'." << llendl;