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

Minor AO bug fix

Browse Source
This commit is contained in:
phr0z3nt04st
2010-07-14 23:10:22 -05:00
parent 9f96c44275
commit 2204eb3d9c
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llao.cpp
View File

@@ -43,6 +43,7 @@ BOOL LLAOStandTimer::tick()
{ {
ao->mStandsCombo->setSimple(LLStringExplicit(LLAO::mStandOverrides.back().asString())); ao->mStandsCombo->setSimple(LLStringExplicit(LLAO::mStandOverrides.back().asString()));
} }
break;
} }
} }
} }
@@ -118,6 +119,13 @@ void LLAO::runAnims(BOOL enabled)
} }
} }
} }
if(mTimer)
{
if(enabled)
mTimer->resume();
else
mTimer->pause();
}
} }
} }
//static //static
@@ -171,17 +179,16 @@ void LLAO::refresh()
LLSD::map_iterator sd_end = overrides.endMap(); LLSD::map_iterator sd_end = overrides.endMap();
for( ; sd_it != sd_end; sd_it++) for( ; sd_it != sd_end; sd_it++)
{ {
// ignore if override is null key...
if(sd_it->second.asUUID().isNull()
// don't allow override to be used as a trigger
|| mOverrides.find(sd_it->second.asUUID()) != mOverrides.end())
continue;
if(sd_it->first == "stands") if(sd_it->first == "stands")
for(LLSD::array_iterator itr = sd_it->second.beginArray(); for(LLSD::array_iterator itr = sd_it->second.beginArray();
itr != sd_it->second.endArray(); ++itr) itr != sd_it->second.endArray(); ++itr)
//list of listness //list of listness
mStandOverrides.push_back(itr->asUUID()); mStandOverrides.push_back(itr->asUUID());
// ignore if override is null key...
if(sd_it->second.asUUID().isNull()
// don't allow override to be used as a trigger
|| mOverrides.find(sd_it->second.asUUID()) != mOverrides.end())
continue;
else if(LLAO::isStand(LLUUID(sd_it->first))) else if(LLAO::isStand(LLUUID(sd_it->first)))
//list of listness //list of listness
mStandOverrides.push_back(sd_it->second.asUUID()); mStandOverrides.push_back(sd_it->second.asUUID());

7
indra/newview/llfilepicker.cpp
View File

@@ -55,7 +55,8 @@ LLFilePicker LLFilePicker::sInstance;
#define SOUND_FILTER L"Sounds (*.wav; *.ogg)\0*.wav;*.ogg\0" #define SOUND_FILTER L"Sounds (*.wav; *.ogg)\0*.wav;*.ogg\0"
#define IMAGE_FILTER L"Images (*.tga; *.bmp; *.jpg; *.jpeg; *.png; *.jp2; *.j2k; *.j2c)\0*.tga;*.bmp;*.jpg;*.jpeg;*.png;*.jp2;*.j2k;*.j2c\0" #define IMAGE_FILTER L"Images (*.tga; *.bmp; *.jpg; *.jpeg; *.png; *.jp2; *.j2k; *.j2c)\0*.tga;*.bmp;*.jpg;*.jpeg;*.png;*.jp2;*.j2k;*.j2c\0"
#define INVGZ_FILTER L"Inv cache (*.inv; *.inv.gz)\0*.inv;*.inv.gz\0" #define INVGZ_FILTER L"Inv cache (*.inv; *.inv.gz)\0*.inv;*.inv.gz\0"
#define BLACKLIST_FILTER L"Asset Blacklist (*.blacklist)\0*.blacklist;\0" #define AO_FILTER L"Animation Override (*.ao)\0*.ao\0"
#define BLACKLIST_FILTER L"Asset Blacklist (*.blacklist)\0*.blacklist\0"
// <edit/> // <edit/>
#define ANIM_FILTER L"Animations (*.bvh)\0*.bvh\0" #define ANIM_FILTER L"Animations (*.bvh)\0*.bvh\0"
#ifdef _CORY_TESTING #ifdef _CORY_TESTING
@@ -201,12 +202,12 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter)
mOFN.lpstrFilter = INVGZ_FILTER \ mOFN.lpstrFilter = INVGZ_FILTER \
L"\0"; L"\0";
break; break;
/*
case FFLOAD_AO: case FFLOAD_AO:
mOFN.lpstrFilter = AO_FILTER \ mOFN.lpstrFilter = AO_FILTER \
L"\0"; L"\0";
break; break;
*/
case FFLOAD_BLACKLIST: case FFLOAD_BLACKLIST:
mOFN.lpstrFilter = BLACKLIST_FILTER \ mOFN.lpstrFilter = BLACKLIST_FILTER \
L"\0"; L"\0";