diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-27 18:44:29 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-27 18:44:29 +0300 |
| commit | 03f81254055c487623211aeae330d02980781f67 (patch) | |
| tree | 07521d45f3bf6af0cda33123628431993665e856 /indra/newview/llmachineid.h | |
| parent | fe7232fd2e0da54ebfe1381e8e615aa94a35a1df (diff) | |
Backed out changeset: 920a0dbf290a Machine id is needed after singletons die
Diffstat (limited to 'indra/newview/llmachineid.h')
| -rw-r--r-- | indra/newview/llmachineid.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/newview/llmachineid.h b/indra/newview/llmachineid.h index b485910eb8..6ef8c36fdb 100644 --- a/indra/newview/llmachineid.h +++ b/indra/newview/llmachineid.h @@ -28,20 +28,23 @@ #define LL_LLMACHINEID_H -class LLMachineID : public LLSingleton<LLMachineID> +class LLMachineID { - LLSINGLETON(LLMachineID); public: - S32 getUniqueID(unsigned char *unique_id, size_t len); + LLMachineID(); + virtual ~LLMachineID(); + static S32 getUniqueID(unsigned char *unique_id, size_t len); + static S32 init(); -private: - S32 requestUniqueID(); +protected: private: - bool mHasStaticUniqueId; - unsigned char mStaticUniqueId[6]; + }; + + + #endif // LL_LLMACHINEID_H |