diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
| commit | a242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch) | |
| tree | 74c5672c9a045e5c8891702cc77eae9062dc9756 /indra/llmessage/llcoproceduremanager.h | |
| parent | 95b26d3becf8fef901ea09998866a9d8227cdcad (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'indra/llmessage/llcoproceduremanager.h')
| -rw-r--r-- | indra/llmessage/llcoproceduremanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcoproceduremanager.h b/indra/llmessage/llcoproceduremanager.h index d5557c129f..2d460826ff 100644 --- a/indra/llmessage/llcoproceduremanager.h +++ b/indra/llmessage/llcoproceduremanager.h @@ -79,6 +79,8 @@ public: void close(); void close(const std::string &pool); + + void initializePool(const std::string &poolName); private: @@ -87,8 +89,6 @@ private: poolMap_t mPoolMap; - poolPtr_t initializePool(const std::string &poolName); - SettingQuery_t mPropertyQueryFn; SettingUpdate_t mPropertyDefineFn; |