aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-08 17:34:15 +0100
committerJacek Antonelli2010-06-19 02:43:37 -0500
commit38158f663774a59cffb39ea0b9549a3855ed6749 (patch)
tree4c81287783b7be77746e6c75c934b874a6b8cb2e /linden/indra/llimage
parentChatbar gestures tooltip should say something useful (diff)
downloadmeta-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 'linden/indra/llimage')
-rw-r--r--linden/indra/llimage/llimage.cpp7
-rw-r--r--linden/indra/llimage/llimage.h2
2 files changed, 6 insertions, 3 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;
55LLMutex* LLImage::sMutex = NULL; 55LLMutex* LLImage::sMutex = NULL;
56 56
57//static 57//static
58void LLImage::initClass() 58void 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
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 102e779..d01ae72 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -82,7 +82,7 @@ typedef enum e_image_codec
82class LLImage 82class LLImage
83{ 83{
84public: 84public:
85 static void initClass(); 85 static void initClass(const bool useDSO);
86 static void cleanupClass(); 86 static void cleanupClass();
87 87
88 static const std::string& getLastError(); 88 static const std::string& getLastError();