livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up some post-merge breakage.

meow-7.2.2
Bryan O'Sullivan 2009-08-31 15:09:13 -07:00
parent 30ff6cabd6
commit f4f02f0f34
4 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/CMakeLists.txt
View File

@ -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.

2
indra/llcommon/llassettype.cpp
View File

@ -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;
}

4
indra/llinventory/llinventory.h
View File

@ -93,10 +93,6 @@ public:
virtual const LLUUID& getUUID() const;
const LLUUID& getParentUUID() const;
virtual const LLUUID& getLinkedUUID() const; // get the inventoryID that this item points to, else this item's inventoryID
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

33
install.xml
View File

@ -578,6 +578,39 @@
</map>
</map>
</map>
<key>googlemock</key>
<map>
<key>copyright</key>
<string>Copyright 2008, Google Inc.</string>
<key>description</key>
<string>Google C++ Mocking Framework (or Google Mock for short) is a library for writing and using C++ mock classes.</string>
<key>license</key>
<string>bsd</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>4863e9fea433d0a4be761ea5d3e8346a</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-darwin-20090626.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>877dabecf84339690191c6115c76366e</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-linux32-20090527.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>be37695d9f26552aec81c8e97ded0212</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-windows-20090529.tar.bz2</uri>
</map>
</map>
</map>
<key>google-perftools</key>
<map>
<key>copyright</key>