diff options
| author | Tom Grimshaw | 2010-06-08 17:34:15 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:37 -0500 |
| commit | 38158f663774a59cffb39ea0b9549a3855ed6749 (patch) | |
| tree | 4c81287783b7be77746e6c75c934b874a6b8cb2e /linden/indra/llimage/llimage.cpp | |
| parent | Chatbar gestures tooltip should say something useful (diff) | |
| download | meta-impy-38158f663774a59cffb39ea0b9549a3855ed6749.zip meta-impy-38158f663774a59cffb39ea0b9549a3855ed6749.tar.gz meta-impy-38158f663774a59cffb39ea0b9549a3855ed6749.tar.bz2 meta-impy-38158f663774a59cffb39ea0b9549a3855ed6749.tar.xz | |
Implement UseKDUIfAvailable setting to specify if we will allow the viewer to use the llkdu library if it exists
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llimage/llimage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp index db983fb..b59c51b 100644 --- a/linden/indra/llimage/llimage.cpp +++ b/linden/indra/llimage/llimage.cpp | |||
| @@ -55,10 +55,13 @@ std::string LLImage::sLastErrorMessage; | |||
| 55 | LLMutex* LLImage::sMutex = NULL; | 55 | LLMutex* LLImage::sMutex = NULL; |
| 56 | 56 | ||
| 57 | //static | 57 | //static |
| 58 | void LLImage::initClass() | 58 | void LLImage::initClass(const bool useDSO) |
| 59 | { | 59 | { |
| 60 | sMutex = new LLMutex(NULL); | 60 | sMutex = new LLMutex(NULL); |
| 61 | LLImageJ2C::openDSO(); | 61 | if (useDSO) |
| 62 | { | ||
| 63 | LLImageJ2C::openDSO(); | ||
| 64 | } | ||
| 62 | } | 65 | } |
| 63 | 66 | ||
| 64 | //static | 67 | //static |