diff options
| author | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
| commit | 1911993cc7761216c70b95e77b49da383c9e162d (patch) | |
| tree | 23ec59769bcaf192324e48141c94affe0ebf2ea0 /indra/llui/llfloater.h | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
| parent | 83c01b041d5b6527b3741b73d075afc4b7ad134c (diff) | |
merge
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); |