diff options
| author | Salad Dais <SaladDais@users.noreply.github.com> | 2024-05-30 16:29:58 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-11 04:21:01 +0200 |
| commit | 6fd4f13c477705a71c3ad24955872d734a6c3dd6 (patch) | |
| tree | 14f0bff1d7892a71f5b74a04e68bc99c0d367502 /indra/newview/llviewerobject.h | |
| parent | 4f67df346b8422f837d6e5ac0702b4f664bc26f6 (diff) | |
Add support for RequestTaskInventory capability
The viewer now prefers to load inventory via the capability rather than
over the deprecated Xfer system, though both are still supported.
# Conflicts:
# indra/newview/llviewerobject.h
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 119b07b1f5..63458e60ea 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -688,6 +688,7 @@ private: // forms task inventory request after some time passed, marks request as pending void fetchInventoryDelayed(const F64 &time_seconds); static void fetchInventoryDelayedCoro(const LLUUID task_inv, const F64 time_seconds); + static void fetchInventoryFromCapCoro(const LLUUID task_inv); public: // @@ -826,6 +827,7 @@ protected: static void processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status); bool loadTaskInvFile(const std::string& filename); + void loadTaskInvLLSD(const LLSD &inv_result); void doInventoryCallback(); bool isOnMap(); |