summaryrefslogtreecommitdiff
path: root/indra/appearance_utility
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-08 04:39:11 +0000
committerDon Kjer <don@lindenlab.com>2012-09-08 04:39:11 +0000
commitcf7eb79fa7eadd6d76890d2a3f9da905de8f4691 (patch)
tree81dd407136683d52f30db5ccca2c9cc8c72342d1 /indra/appearance_utility
parent5f8b94094877730082340dc21ff0162b6177a427 (diff)
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
Diffstat (limited to 'indra/appearance_utility')
-rw-r--r--indra/appearance_utility/CMakeLists.txt3
-rw-r--r--indra/appearance_utility/appearance_utility.cpp4
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/appearance_utility/CMakeLists.txt b/indra/appearance_utility/CMakeLists.txt
index c38f811b44..d860dae4df 100644
--- a/indra/appearance_utility/CMakeLists.txt
+++ b/indra/appearance_utility/CMakeLists.txt
@@ -9,6 +9,7 @@ include(OpenSSL)
include(UI)
include(LLAppearance)
include(LLCommon)
+include(LLInventory)
include(LLVFS)
include(LLXML)
include(LLUI)
@@ -19,6 +20,7 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LLUI_INCLUDE_DIRS}
+ ${LLINVENTORY_INCLUDE_DIRS}
${CURL_INCLUDE_DIRS}
${CARES_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
@@ -44,6 +46,7 @@ target_link_libraries(appearance-utility-bin
${CRYPTO_LIBRARIES}
${UI_LIBRARIES}
${LLAPPEARANCE_LIBRARIES}
+ ${LLINVENTORY_LIBRARIES}
${LLXML_LIBRARIES}
${LLUI_LIBRARIES}
${LLVFS_LIBRARIES}
diff --git a/indra/appearance_utility/appearance_utility.cpp b/indra/appearance_utility/appearance_utility.cpp
index 130bca84a8..c7f8703e28 100644
--- a/indra/appearance_utility/appearance_utility.cpp
+++ b/indra/appearance_utility/appearance_utility.cpp
@@ -38,6 +38,8 @@
#include "llsdserialize.h"
#include "llsdutil.h"
+//#include "llwearabledata.h"
+
enum EResult
{
RV_SUCCESS = 0,
@@ -150,6 +152,8 @@ EResult process_tbd(LLSD& input, std::ostream& output, LLSD& error_llsd)
{
EResult rv = RV_SUCCESS;
+ //LLWearableData wearable_data;
+
LLSD result;
result["success"] = true;
result["input"] = input;