diff options
| author | Richard Linden <none@none> | 2010-06-24 15:00:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-24 15:00:03 -0700 |
| commit | 63b3bf29208d51df84f10594266661d6294df4c6 (patch) | |
| tree | f07fd0aa162283ffd8914c7cfdc7a8cd7b201759 /indra/llui/llfloater.h | |
| parent | a77b0827c2189101de44801e003588881a75a79b (diff) | |
| parent | e7040fad36bd03407f5c51e9cac809ce8b98c900 (diff) | |
merge
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 654164ddc0..3ea035777c 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -149,7 +149,7 @@ public: static void setupParamsForExport(Params& p, LLView* parent); void initFromParams(const LLFloater::Params& p); - bool initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL); + bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL); /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false); /*virtual*/ BOOL canSnapTo(const LLView* other_view); |