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

Removed pointless asset fetches for expression-based gestures (opposed to animation based ones), since they don't have actual animation assets.

Browse Source
This commit is contained in:
Shyotl
2012-10-11 02:40:00 -05:00
parent ac0a32e690
commit eb5b1312bb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llgesturemgr.cpp
View File

@@ -33,6 +33,7 @@
#include <algorithm> #include <algorithm>
// library // library
#include "llanimationstates.h"
#include "llaudioengine.h" #include "llaudioengine.h"
#include "lldatapacker.h" #include "lldatapacker.h"
#include "llinventory.h" #include "llinventory.h"
@@ -551,6 +552,13 @@ void LLGestureMgr::playGesture(LLMultiGesture* gesture)
|| anim_step->mFlags & ANIM_FLAG_STOP || anim_step->mFlags & ANIM_FLAG_STOP
|| gAssetStorage->hasLocalAsset(anim_id, LLAssetType::AT_ANIMATION))) || gAssetStorage->hasLocalAsset(anim_id, LLAssetType::AT_ANIMATION)))
{ {
//Singu note: Don't attempt to fetch expressions/emotes.
const char* emote_name = gAnimLibrary.animStateToString(anim_id);
if(emote_name && strstr(emote_name,"express_")==emote_name)
{
break;
}
mLoadingAssets.insert(anim_id); mLoadingAssets.insert(anim_id);
LLUUID* id = new LLUUID(gAgentID); LLUUID* id = new LLUUID(gAgentID);