#6119 Mutex deadlock on LLGridManager singleton

LLGridManager is performance critical and low level enough that it should
just be turned into LLSimpleton. Without capture_dependency there won't
be a 'deadlock'.

1 files changed, 2 insertions, 0 deletions

diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 1cbb8b50eb..6190d7052b 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -175,6 +175,7 @@ namespace tut
     {
         viewerNetworkTest()
         {
+            LLGridManager::createInstance();
             LLFile::remove(TEST_FILENAME);
             gCmdLineLoginURI.clear();
             gCmdLineGridChoice.clear();
@@ -185,6 +186,7 @@ namespace tut
         ~viewerNetworkTest()
         {
             LLFile::remove(TEST_FILENAME);
+            LLGridManager::deleteSingleton();
         }
     };