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

Random cleanup lines here and there before I refactor the AO entirely

Browse Source
This commit is contained in:
Lirusaito
2019-01-10 17:44:13 -05:00
parent da2a9a5bf5
commit 0c585aca39
2 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/floaterao.cpp
View File

@@ -717,8 +717,7 @@ void LLFloaterAO::run()
}
else
{
if (state == STATE_AGENT_SIT) gAgent.sendAnimationRequest(GetAnimIDFromState(state), (gSavedSettings.getBOOL("AOEnabled") && gSavedSettings.getBOOL("AOSitsEnabled")) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
else gAgent.sendAnimationRequest(GetAnimIDFromState(state), gSavedSettings.getBOOL("AOEnabled") ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
gAgent.sendAnimationRequest(GetAnimIDFromState(state), (gSavedSettings.getBOOL("AOEnabled") && (state != STATE_AGENT_SIT || gSavedSettings.getBOOL("AOSitsEnabled"))) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
}
}
@@ -938,12 +937,8 @@ BOOL LLFloaterAO::startMotion(const LLUUID& id, F32 time_offset, BOOL stand)
{
if (id.notNull())
{
BOOL sitting = FALSE;
if (gAgentAvatarp)
{
sitting = gAgentAvatarp->isSitting();
}
if (sitting) return FALSE;
if (gAgentAvatarp && gAgentAvatarp->isSitting())
return FALSE;
gAgent.sendAnimationRequest(id, ANIM_REQUEST_START);
return TRUE;
}
@@ -1502,23 +1497,11 @@ BOOL LLFloaterAO::SetDefault(void* userdata, LLUUID ao_id, std::string defaultan
class ObjectNameMatches : public LLInventoryCollectFunctor
{
public:
ObjectNameMatches(std::string name)
{
sName = name;
}
ObjectNameMatches(std::string name) : sName(name) {}
virtual ~ObjectNameMatches() {}
virtual bool operator()(LLInventoryCategory* cat,
LLInventoryItem* item)
virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
{
if(item)
{
if (item->getParentUUID() == LLFloaterAO::invfolderid)
{
return (item->getName() == sName);
}
return false;
}
return false;
return item && item->getParentUUID() == LLFloaterAO::invfolderid && item->getName() == sName;
}
private:
std::string sName;
@@ -1526,16 +1509,11 @@ private:
const LLUUID& LLFloaterAO::getAssetIDByName(const std::string& name)
{
if (name.empty() || !(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())) return LLUUID::null;
if (name.empty() || !LLInventoryModelBackgroundFetch::instance().isEverythingFetched()) return LLUUID::null;
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
ObjectNameMatches objectnamematches(name);
gInventory.collectDescendentsIf(LLUUID::null,cats,items,FALSE,objectnamematches);
gInventory.collectDescendentsIf(LLUUID::null,cats,items,FALSE, ObjectNameMatches(name));
if (items.size())
{
return items[0]->getAssetUUID();
}
return LLUUID::null;
return items.size() ? items[0]->getAssetUUID() : LLUUID::null;
};

4
indra/newview/floaterao.h
View File

@@ -75,14 +75,14 @@ public:
static void run();
static void updateLayout(LLFloaterAO* floater);
static BOOL loadAnims();
//static BOOL loadAnims();
static void typing(bool start);
static int flyToSwimState(const int state);
static int swimToFlyState(const int state);
static int getAnimationState();
static void setAnimationState(int state);
static void setStates(const LLUUID& id, BOOL start);
//static void setStates(const LLUUID& id, BOOL start);
static LLUUID getCurrentStandId();
static void setCurrentStandId(const LLUUID& id);