diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
| commit | 61bddc22d97150cd590bc4184355133b6dd3ff87 (patch) | |
| tree | 59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/llinventorypanel.h | |
| parent | a18d4df6c742aa397b70e4dafb41475bd201a558 (diff) | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index b69edd8b93..5cb9dde47a 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -201,6 +201,7 @@ public: void doToSelected(const LLSD& userdata); void doCreate(const LLSD& userdata); bool beginIMSession(); + void fileUploadLocation(const LLSD& userdata); bool attachObject(const LLSD& userdata); static void idle(void* user_data); |