diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:04:31 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:04:31 +0200 |
| commit | 7b022144c787345e51579787f4a84de8c196ac43 (patch) | |
| tree | 10fafeb5b5f85a23fc345b842f42b953d215af7d /indra/newview/llfloaternamedesc.h | |
| parent | 3e403ffb4f6d295b11c9842bed53df5d15848f0b (diff) | |
| parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) | |
Merge branch 'master' into DRTVWR-460
Diffstat (limited to 'indra/newview/llfloaternamedesc.h')
| -rw-r--r-- | indra/newview/llfloaternamedesc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h index 41643681ac..589f470e82 100644 --- a/indra/newview/llfloaternamedesc.h +++ b/indra/newview/llfloaternamedesc.h @@ -30,6 +30,7 @@ #include "llfloater.h" #include "llresizehandle.h" #include "llstring.h" +#include "llassettype.h" class LLLineEditor; class LLButton; @@ -45,6 +46,8 @@ public: void onBtnOK(); void onBtnCancel(); void doCommit(); + + S32 getExpectedUploadCost() const; protected: virtual void onCommit(); |