diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
commit | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (patch) | |
tree | 2cc2f438c657cc554c64bc1e6248a4f716b99a29 /indra/llui/llpanel.h | |
parent | 0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff) | |
parent | 120733ea0d479f3c0224f94bb17e5dc32194dc9f (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llpanel.h')
-rw-r--r-- | indra/llui/llpanel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index f620201020..e63b41f97c 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -105,7 +105,7 @@ protected: LLPanel(const LLPanel::Params& params = getDefaultParams()); public: - BOOL buildFromFile(const std::string &filename, LLXMLNodePtr output_node = NULL, const LLPanel::Params&default_params = getDefaultParams()); + BOOL buildFromFile(const std::string &filename, const LLPanel::Params& default_params = getDefaultParams()); static LLPanel* createFactoryPanel(const std::string& name); |