diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
| commit | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (patch) | |
| tree | 0c9b22edca280d8e2a2ef280360485c139c9b829 /indra/newview/llviewerassetstorage.h | |
| parent | 4758355c599d1487c11884d3f700981e011cb7b7 (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 0965a17ce1..c3719d0918 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -65,8 +65,6 @@ public: bool user_waiting=FALSE, F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override; - void checkForTimeouts() override; - protected: void _queueDataRequest(const LLUUID& uuid, LLAssetType::EType type, @@ -118,8 +116,6 @@ protected: LLGetAssetCallback mCallback; void *mUserData; }; - typedef std::list<CoroWaitList> wait_list_t; - wait_list_t mCoroWaitList; std::string mViewerAssetUrl; S32 mCountRequests; |