diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-28 12:10:29 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-28 12:10:29 -0700 |
| commit | 1fe7b13d1f8da978203fb7d3b64adc149fa50081 (patch) | |
| tree | db8bd5851e0b321f28f7d5d4283e0b27c290bef4 /indra/newview/llappviewer.cpp | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
| parent | 6b8fec008bbf5da5687a7438ad56559237b5a850 (diff) | |
automated merge
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 475a075d7e..ca9830e1a0 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(); |