diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
| commit | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (patch) | |
| tree | d746c96bab1bfd44c6373926608e91c0f2fd9e49 /indra/llui/llfloater.h | |
| parent | eab232d3ed49bfb1f873e332ff57ec8c311c163b (diff) | |
| parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
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 13d9bf5adc..f7e121ed7e 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -208,7 +208,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, bool cacheable = false); + bool buildFromFile(const std::string &filename); boost::signals2::connection setMinimizeCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setOpenCallback( const commit_signal_t::slot_type& cb ); |