Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

This commit is contained in:
Inusaito Sayori
2015-08-12 14:52:52 -04:00
201 changed files with 10553 additions and 6878 deletions

View File

@@ -4475,11 +4475,12 @@ void LLAgent::fidget()
void LLAgent::stopFidget()
{
LLDynamicArray<LLUUID> anims;
anims.put(ANIM_AGENT_STAND_1);
anims.put(ANIM_AGENT_STAND_2);
anims.put(ANIM_AGENT_STAND_3);
anims.put(ANIM_AGENT_STAND_4);
std::vector<LLUUID> anims;
anims.reserve(4);
anims.push_back(ANIM_AGENT_STAND_1);
anims.push_back(ANIM_AGENT_STAND_2);
anims.push_back(ANIM_AGENT_STAND_3);
anims.push_back(ANIM_AGENT_STAND_4);
gAgent.sendAnimationRequests(anims, ANIM_REQUEST_STOP);
}