diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:19:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:19:06 +0100 |
| commit | 0ca09bea5ddfbb41e29fcc2b36e46c7e86171198 (patch) | |
| tree | 6cea69c52dccf3ed3f5e0e77f80aa77f8ad88e9f /indra/newview/llappviewer.cpp | |
| parent | 383d695fe6d14ba988820475e0cc9b64e18b7de5 (diff) | |
| parent | 3df90898b18feeda876857acb00f1f3046793e69 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1c8d1a47a0..b9eb99230b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -195,6 +195,7 @@ // Include for security api initialization #include "llsecapi.h" +#include "llmachineid.h" // *FIX: These extern globals should be cleaned up. // The globals either represent state/config/resource-storage of either @@ -619,6 +620,7 @@ bool LLAppViewer::init() // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. LLCurl::initClass(); + LLMachineID::init(); initThreads(); writeSystemInfo(); |