Implement UseKDUIfAvailable setting to specify if we will allow the viewer to use the llkdu library if it exists

4 files changed, 18 insertions, 4 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;
 LLMutex* LLImage::sMutex = NULL;
 
 //static
-void LLImage::initClass()
+void LLImage::initClass(const bool useDSO)
 {
         sMutex = new LLMutex(NULL);
-        LLImageJ2C::openDSO();
+        if (useDSO)
+        {
+                LLImageJ2C::openDSO();
+        }
 }
 
 //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
 class LLImage
 {
 public:
-        static void initClass();
+        static void initClass(const bool useDSO);
         static void cleanupClass();
 
         static const std::string& getLastError();
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c1ed2b4..aa6b1fa 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -674,6 +674,17 @@
     <key>Value</key>
     <string>f54a0c32-3cd1-d49a-5b4f-7b792bebc204</string>
   </map>
+  <key>UseKDUIfAvailable</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable KDU DSO</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>VerticalIMTabs</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 0b09d00..ab4157f 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1550,7 +1550,7 @@ bool LLAppViewer::initThreads()
         LLAppViewer::sImageDecodeThread = new LLImageDecodeThread(enable_threads && true);
         LLAppViewer::sTextureCache = new LLTextureCache(enable_threads && true);
         LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && true);
-        LLImage::initClass();
+        LLImage::initClass(gSavedSettings.getBOOL("UseKDUIfAvailable"));
 
         // *FIX: no error handling here!
         return true;