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

Fix SV-2245: Viewer AO Doesn't respond instantly

Browse Source
This commit is contained in:
Lirusaito
2019-01-09 13:14:24 -05:00
parent 022fba2ba4
commit 9a424ff264
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/floaterao.cpp
View File

@@ -124,17 +124,18 @@ AOInvTimer::~AOInvTimer()
}
BOOL AOInvTimer::tick()
{
if (!(gSavedSettings.getBOOL("AOEnabled"))) return TRUE;
if(LLStartUp::getStartupState() >= STATE_INVENTORY_SEND)
{
if(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
{
// cmdline_printchat("Inventory fetched, loading AO.");
LLFloaterAO::init();
gSavedSettings.getControl("AOEnabled")->getSignal()->connect(boost::bind(&LLFloaterAO::run));
gSavedSettings.getControl("AOSitsEnabled")->getSignal()->connect(boost::bind(&LLFloaterAO::run));
return TRUE;
}
}
return FALSE;
return !gSavedSettings.getBOOL("AOEnabled");
}
// STUFF -------------------------------------------------------
@@ -254,8 +255,6 @@ BOOL LLFloaterAO::postBuild()
childSetAction("newcard",onClickNewCard,this);
childSetAction("prevstand",onClickPrevStand,this);
childSetAction("nextstand",onClickNextStand,this);
getChild<LLUICtrl>("AOEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleAO));
getChild<LLUICtrl>("AOSitsEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleSits));
getChild<LLUICtrl>("standtime")->setCommitCallback(boost::bind(&LLFloaterAO::onSpinnerCommit,_1));
mcomboBox_stands = getChild<LLComboBox>("stands");
mcomboBox_walks = getChild<LLComboBox>("walks");
@@ -624,16 +623,6 @@ void LLFloaterAO::onClickLess(void* data)
updateLayout(sInstance);
}
void LLFloaterAO::onClickToggleAO()
{
run();
}
void LLFloaterAO::onClickToggleSits()
{
run();
}
void LLFloaterAO::run()
{

2
indra/newview/floaterao.h
View File

@@ -66,8 +66,6 @@ public:
static void show(void*);
static void init();
static void onClickToggleAO();
static void onClickToggleSits();
static void run();
static void updateLayout(LLFloaterAO* floater);