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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Andros Baphomet
2013-10-12 21:23:07 -04:00
parent ffb4abebdd aa077032b7
commit e363aeb618
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llaudio/llaudioengine.cpp
View File

@@ -277,11 +277,6 @@ void LLAudioEngine::updateChannels()
}
}
llassert(found_buffer);
if(!mChannels[i]->mCurrentBufferp->mInUse)
{
llassert(!mChannels[i]->isPlaying());
llassert(!mChannels[i]->isWaiting());
}
}
#endif //SHOW_ASSERT
}
@@ -328,7 +323,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
//Also add sources that might be able to start playing to a priority queue.
//Only sources without channels, or are waiting for a syncmaster, should be added to this queue.
std::priority_queue<audio_source_t,std::vector<audio_source_t,boost::pool_allocator<audio_source_t> >,SourcePriorityComparator> queue;
for (source_map::iterator iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
for (source_map::iterator iter = mAllSources.begin(); iter != mAllSources.end();)
{
LLAudioSource *sourcep = iter->second;
@@ -344,6 +339,9 @@ void LLAudioEngine::idle(F32 max_decode_time)
continue;
}
// Increment iter here (it is not used anymore), so we can use continue below to move on to the next source.
++iter;
LLAudioData *adp = sourcep->getCurrentData();
//If there is no current data at all, or if it hasn't loaded, we must skip this source.
if (!adp || !adp->getBuffer())

4
indra/llaudio/llaudioengine_fmodex.cpp
View File

@@ -178,7 +178,7 @@ public:
}
void removeChannel(FMOD::Channel* channel)
{
gSoundCheck.assertActiveState(channel,true);
assertActiveState(channel,true);
active_channels_t::const_iterator it = mActiveChannels.find(channel);
llassert(it != mActiveChannels.end());
@@ -208,7 +208,7 @@ public:
if(try_log && sVerboseDebugging)
#endif
{
CFMODSoundChecks::STATUS chan = gSoundCheck.getPtrStatus(ptr);
CFMODSoundChecks::STATUS chan = getPtrStatus(ptr);
if(try_log && sVerboseDebugging)
{
if(active)

6
indra/newview/llface.cpp
View File

@@ -791,9 +791,9 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
// Catch potential badness from normalization before it happens
//
llassert(mat_normal.mMatrix[0].isFinite3() && (mat_normal.mMatrix[0].dot3(mat_normal.mMatrix[0]).getF32() > F_APPROXIMATELY_ZERO));
llassert(mat_normal.mMatrix[1].isFinite3() && (mat_normal.mMatrix[1].dot3(mat_normal.mMatrix[1]).getF32() > F_APPROXIMATELY_ZERO));
llassert(mat_normal.mMatrix[2].isFinite3() && (mat_normal.mMatrix[2].dot3(mat_normal.mMatrix[2]).getF32() > F_APPROXIMATELY_ZERO));
//llassert(mat_normal.mMatrix[0].isFinite3() && (mat_normal.mMatrix[0].dot3(mat_normal.mMatrix[0]).getF32() > F_APPROXIMATELY_ZERO));
//llassert(mat_normal.mMatrix[1].isFinite3() && (mat_normal.mMatrix[1].dot3(mat_normal.mMatrix[1]).getF32() > F_APPROXIMATELY_ZERO));
//llassert(mat_normal.mMatrix[2].isFinite3() && (mat_normal.mMatrix[2].dot3(mat_normal.mMatrix[2]).getF32() > F_APPROXIMATELY_ZERO));
mat_normal.mMatrix[0].normalize3fast();
mat_normal.mMatrix[1].normalize3fast();