diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-24 10:22:20 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-24 10:22:20 +0100 |
| commit | 8de8669f340179324f47668dbd9102ba4f8526bd (patch) | |
| tree | 663f02ab3761092aec66682c139617f64a2407bc /indra/llui/llfloater.h | |
| parent | 528964429633b5f878216ba0ffa80c69abc70205 (diff) | |
| parent | b25d969b61eb1e4f114ee0e632d1de9777780e9f (diff) | |
merge from viewer-development
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 5ecf515cf9..c02587d9d8 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -141,6 +141,7 @@ public: // Don't export top/left for rect, only height/width static void setupParamsForExport(Params& p, LLView* parent); + bool buildFromFile(const std::string &filename, LLXMLNodePtr output_node = NULL); void initFromParams(const LLFloater::Params& p); bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL); |