diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-12 04:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-12 04:32:05 +0200 |
| commit | b50ad90febda24d2296541f46ea1a129232aad70 (patch) | |
| tree | d0c25fc032c156814b4b05c892dcfce1737508a1 /indra/newview/llviewerobject.h | |
| parent | e70694e67cd1902fd2a797e24c48f08643291538 (diff) | |
| parent | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (diff) | |
Merge pull request #3708 from secondlife/marchcat/2025.03-maint-b
2025.03 Cherry pick from Maint B
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(); |