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

WIP[win64]: it builds, runs. webkit disabled in cmake for now

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-20 17:03:48 +02:00
parent 6bae4a8d92
commit 17c59f25f5
14 changed files with 253 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterpathfindingobjects.cpp
View File

@@ -397,12 +397,14 @@ 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));
pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1));
}
#endif
}
void LLFloaterPathfindingObjects::updateControlsOnScrollListChange()