diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
| commit | d6480e2b7f38facd27bf90376aca1c2b3832fa55 (patch) | |
| tree | bd8bd223515cd4ecf74d1efca404af793825f2f2 /indra/newview/llaisapi.h | |
| parent | 11a9332fa7bd830d8e44f15a91e008f3a6f9c19d (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
Diffstat (limited to 'indra/newview/llaisapi.h')
| -rw-r--r-- | indra/newview/llaisapi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h index e97059014b..856f3fc180 100644 --- a/indra/newview/llaisapi.h +++ b/indra/newview/llaisapi.h @@ -31,7 +31,6 @@ #include <map> #include <set> #include <string> -#include "llhttpretrypolicy.h" #include "llviewerinventory.h" #include "llcorehttputil.h" #include "llcoproceduremanager.h" @@ -72,6 +71,7 @@ private: const std::string, LLSD, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t) > invokationFn_t; static void EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc); + static void onIdle(void *userdata); // launches postponed AIS commands static std::string getInvCap(); static std::string getLibCap(); @@ -80,6 +80,8 @@ private: invokationFn_t invoke, std::string url, LLUUID targetId, LLSD body, completion_t callback, COMMAND_TYPE type); + typedef std::pair<std::string, LLCoprocedureManager::CoProcedure_t> ais_query_item_t; + static std::list<ais_query_item_t> sPostponedQuery; }; class AISUpdate |