diff options
author | Rider Linden <rider@lindenlab.com> | 2017-01-25 11:13:59 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-01-25 11:13:59 -0800 |
commit | 25cd2ed2052b0d30d61e8b81df151993983f561b (patch) | |
tree | 7f9b29356b658303bdf7608a25ccb23c8e6130da /indra/newview/llpreviewnotecard.h | |
parent | 8d86f5a0c457fceff5923fb7ca32259b2718addc (diff) | |
parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) |
Merge
Diffstat (limited to 'indra/newview/llpreviewnotecard.h')
-rw-r--r-- | indra/newview/llpreviewnotecard.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h index ba571995f6..017c4485ba 100644 --- a/indra/newview/llpreviewnotecard.h +++ b/indra/newview/llpreviewnotecard.h @@ -96,6 +96,7 @@ protected: bool handleConfirmDeleteDialog(const LLSD& notification, const LLSD& response); static void finishInventoryUpload(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId); + static void finishTaskUpload(LLUUID itemId, LLUUID newAssetId, LLUUID taskId); protected: LLViewerTextEditor* mEditor; |