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

Merge remote-tracking branch 'Lirusaito/Canon' into Cupcake

Browse Source
This commit is contained in:
Drake Arconis
2013-03-04 12:17:41 -05:00
parent b800320a49 3effb23f08
commit b667c81f84
71 changed files with 3341 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewermenu.cpp
View File

@@ -9796,5 +9796,18 @@ void custom_selected(void* user_data)
LLSD menuAction = LLSD::emptyMap();
menuAction["action"] = LLSD(custom->getName());
LLSD selection = LLSD::emptyArray();
for (LLObjectSelection::iterator iter = LLSelectMgr::getInstance()->getSelection()->begin();
iter != LLSelectMgr::getInstance()->getSelection()->end(); iter++)
{
LLSelectNode* selectNode = *iter;
LLViewerObject*cur = selectNode->getObject();
selection.append(LLSD((S32)cur->getLocalID()));
}
menuAction["selection"] = selection;
LLHTTPClient::post(url, menuAction, new LLHTTPClient::ResponderIgnore);
}