diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
commit | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch) | |
tree | 9a22b0583bb290a242df3c619665fdb692e1ecef /indra/llimage/llimage.cpp | |
parent | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff) | |
parent | 49de8add8355455da4b6ec5aaa55427fafa94322 (diff) |
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r-- | indra/llimage/llimage.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 5c33b675ca..b46a99e030 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -52,13 +52,11 @@ LLMutex* LLImage::sMutex = NULL; void LLImage::initClass() { sMutex = new LLMutex(NULL); - LLImageJ2C::openDSO(); } //static void LLImage::cleanupClass() { - LLImageJ2C::closeDSO(); delete sMutex; sMutex = NULL; } |