summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autobuild.xml30
-rw-r--r--indra/CMakeLists.txt7
2 files changed, 37 insertions, 0 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 4e5aaa18aa..34a526add8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1627,6 +1627,36 @@
<key>version</key>
<string>2.9.4.557062</string>
</map>
+ <key>llappearance_utility</key>
+ <map>
+ <key>copyright</key>
+ <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+ <key>description</key>
+ <string>Linden Lab appearance utility for server-side avatar baking services.</string>
+ <key>license</key>
+ <string>Proprietary</string>
+ <key>license_file</key>
+ <string>LICENSES/llappearanceutility.txt</string>
+ <key>name</key>
+ <string>llappearance_utility</string>
+ <key>platforms</key>
+ <map>
+ <key>linux</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>fddd634dec5ec03924d62cc774f7f8ea</string>
+ <key>url</key>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/p64_viewer-llappearance-utility/rev/317266/arch/Linux/installer/llappearance_utility-0.0.1-linux-317266.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>linux</string>
+ </map>
+ </map>
+ <key>version</key>
+ <string>0.0.1</string>
+ </map>
<key>llca</key>
<map>
<key>copyright</key>
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index e425775317..dc1c28ce5b 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -67,6 +67,13 @@ if (ENABLE_MEDIA_PLUGINS)
add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
endif (ENABLE_MEDIA_PLUGINS)
+if (LINUX)
+ if (INSTALL_PROPRIETARY)
+ include(LLAppearanceUtility)
+ add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR})
+ endif (INSTALL_PROPRIETARY)
+endif (LINUX)
+
if (WINDOWS)
# cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
if (EXISTS ${VIEWER_DIR}win_setup)