diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 15:09:13 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 15:09:13 -0700 |
| commit | f4f02f0f34d5a26472ea4a6c681a380a2174d1bd (patch) | |
| tree | a9702ab41b541c85e7d2653fb562f743b5c5117e /indra | |
| parent | 30ff6cabd61f2f083df5df1e6e70cc94742af477 (diff) | |
Fix up some post-merge breakage.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llcommon/llassettype.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llinventory.h | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index a93623d24e..b57798af0c 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -242,7 +242,7 @@ SET(llcommon_TEST_SOURCE_FILES LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) -set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) +set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} gmock gtest) LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp index 6d4043b8e0..66c8bcac6a 100644 --- a/indra/llcommon/llassettype.cpp +++ b/indra/llcommon/llassettype.cpp @@ -287,8 +287,6 @@ bool LLAssetType::lookupIsEnsembleCategoryType(EType asset_type) { return (asset_type >= AT_FOLDER_ENSEMBLE_START && asset_type <= AT_FOLDER_ENSEMBLE_END); - } - return true; } diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index b953e91309..32f19d6be5 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -96,10 +96,6 @@ public: virtual const std::string& getName() const; virtual LLAssetType::EType getType() const; LLAssetType::EType getActualType() const; // bypasses indirection for linked items - - virtual const std::string& getName() const; - virtual LLAssetType::EType getType() const; - LLAssetType::EType getActualType() const; // bypasses indirection for linked items BOOL getIsLinkType() const; // mutators - will not call updateServer(); void setUUID(const LLUUID& new_uuid); |