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

Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio

Browse Source
This commit is contained in:
Shyotl
2014-11-22 22:20:32 -06:00
parent f8927a8a11 2d0905a4a6
commit c2abbaedc8
130 changed files with 2810 additions and 2321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/aicurlprivate.h
View File

@@ -466,7 +466,7 @@ class BufferedCurlEasyRequest : public CurlEasyRequest {
// Return true when prepRequest was already called and the object has not been
// invalidated as a result of calling aborted().
bool isValid(void) const { return mResponder; }
bool isValid(void) const { return !!mResponder; }
// Return the capability type of this request.
AICapabilityType capability_type(void) const { llassert(mCapabilityType != number_of_capability_types); return mCapabilityType; }

4
indra/llmessage/llregionhandle.h
View File

@@ -73,7 +73,7 @@ inline BOOL to_region_handle(const F32 x_pos, const F32 y_pos, U64 *region_handl
}
else
{
x_int = (U32)llround(x_pos);
x_int = (U32)llmath::llround(x_pos);
}
if (y_pos < 0.f)
{
@@ -82,7 +82,7 @@ inline BOOL to_region_handle(const F32 x_pos, const F32 y_pos, U64 *region_handl
}
else
{
y_int = (U32)llround(y_pos);
y_int = (U32)llmath::llround(y_pos);
}
*region_handle = to_region_handle(x_int, y_int);
return TRUE;

2
indra/llmessage/llthrottle.cpp
View File

@@ -391,7 +391,7 @@ BOOL LLThrottleGroup::dynamicAdjust()
}
mBitsSentThisPeriod[i] = 0;
total += llround(mBitsSentHistory[i]);
total += llmath::llround(mBitsSentHistory[i]);
}
// Look for busy channels

2
indra/llmessage/message.cpp
View File

@@ -2765,7 +2765,7 @@ void LLMessageSystem::dumpReceiveCounts()
if (mt->mReceiveCount > 0)
{
LL_INFOS("Messaging") << "Num: " << std::setw(3) << mt->mReceiveCount << " Bytes: " << std::setw(6) << mt->mReceiveBytes
<< " Invalid: " << std::setw(3) << mt->mReceiveInvalid << " " << mt->mName << " " << llround(100 * mt->mDecodeTimeThisFrame / mReceiveTime) << "%" << llendl;
<< " Invalid: " << std::setw(3) << mt->mReceiveInvalid << " " << mt->mName << " " << llmath::llround(100 * mt->mDecodeTimeThisFrame / mReceiveTime) << "%" << llendl;
}
}
}