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

Migrated restoration of physics capsule into pathing character

master
prep 2012-06-01 16:02:12 -04:00
parent a8ff37b956
commit bf8d3e1d30
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloaterpathfindingcharacters.cpp
View File

@ -57,8 +57,11 @@ void LLFloaterPathfindingCharacters::openCharactersViewer()
{
LLFloaterReg::toggleInstanceOrBringToFront("pathfinding_characters");
}
void LLFloaterPathfindingCharacters::onClose(bool pIsAppQuitting)
{
unhideAnyCharacters();
LLFloaterPathfindingObjects::onClose( pIsAppQuitting );
}
LLFloaterPathfindingCharacters::LLFloaterPathfindingCharacters(const LLSD& pSeed)
@ -246,3 +249,20 @@ void LLFloaterPathfindingCharacters::updateStateOnEditFields()
LLFloaterPathfindingObjects::updateStateOnEditFields();
}
void LLFloaterPathfindingCharacters::unhideAnyCharacters( )
{
std::vector<LLScrollListItem*> selectedItems = mObjectsScrollList->getAllSelected();
int numSelectedItems = selectedItems.size();
uuid_vec_t selectedUUIDs;
if (numSelectedItems > 0)
{
for (std::vector<LLScrollListItem*>::const_iterator itemIter = selectedItems.begin();
itemIter != selectedItems.end(); ++itemIter)
{
const LLScrollListItem *listItem = *itemIter;
gPipeline.restoreHiddenObject( listItem->getUUID() );
}
}
}

2
indra/newview/llfloaterpathfindingcharacters.h
View File

@ -59,6 +59,8 @@ protected:
virtual LLPathfindingObjectListPtr getEmptyObjectList() const;
void unhideAnyCharacters();
private:
LLSD buildCharacterScrollListData(const LLPathfindingCharacter *pCharacterPtr) const;

19
indra/newview/llfloaterpathfindingobjects.cpp
View File

@ -90,8 +90,7 @@ void LLFloaterPathfindingObjects::onOpen(const LLSD &pKey)
void LLFloaterPathfindingObjects::onClose(bool pIsAppQuitting)
{
unhideAnyCharacters();
if (mGodLevelChangeSlot.connected())
{
mGodLevelChangeSlot.disconnect();
@ -693,19 +692,3 @@ LLPathfindingObjectPtr LLFloaterPathfindingObjects::findObject(const LLScrollLis
return objectPtr;
}
void LLFloaterPathfindingObjects::unhideAnyCharacters( )
{
std::vector<LLScrollListItem*> selectedItems = mObjectsScrollList->getAllSelected();
int numSelectedItems = selectedItems.size();
uuid_vec_t selectedUUIDs;
if (numSelectedItems > 0)
{
for (std::vector<LLScrollListItem*>::const_iterator itemIter = selectedItems.begin();
itemIter != selectedItems.end(); ++itemIter)
{
const LLScrollListItem *listItem = *itemIter;
gPipeline.restoreHiddenObject( listItem->getUUID() );
}
}
}

2
indra/newview/llfloaterpathfindingobjects.h
View File

@ -124,8 +124,6 @@ private:
LLPathfindingObjectPtr findObject(const LLScrollListItem *pListItem) const;
void unhideAnyCharacters( );
protected:
LLScrollListCtrl *mObjectsScrollList;
LLTextBase *mMessagingStatus;