diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
| commit | 55a812ca7797ec1b857e95254fde1fa75bd92d06 (patch) | |
| tree | c15fdb992af40162cc5adb3c25257f3ba1f069a1 /indra/llui/llpanel.h | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
| parent | a9ea41003587e2411c7247f84ea04df2a686552b (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); |