Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VS2012 related changes

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-22 00:58:05 +02:00
parent 73e1a9ad78
commit 5cd7f05851
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/libhacd/hacdHACD.h
View File

@@ -22,7 +22,7 @@
#include <set>
#include <vector>
#include <queue>
#if defined(_WIN32) && _MSC_VER >= 1700
#if defined(_MSC_VER) && _MSC_VER >= 1700
#include <functional>
#endif
namespace HACD

5
indra/newview/llfloaterpathfindingobjects.cpp
View File

@@ -397,14 +397,11 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec
}
LLScrollListItem *scrollListItem = mObjectsScrollList->addElement(rowParams);
// Singu TODO::WIN64
#if !defined(_WIN64)
if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName())
{
mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem));
mMissingNameObjectsScrollListItems.insert(std::make_pair(pObjectPtr->getUUID().asString(), scrollListItem));
pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1));
}
#endif
}
void LLFloaterPathfindingObjects::updateControlsOnScrollListChange()