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

Trivial changes. Resolved some sign mismatch warnings, and now using LLCachedControl for 'SGIgnoreSimulatorCameraConstraint' setting lookup.

Browse Source
This commit is contained in:
Shyotl
2012-11-29 11:58:41 -06:00
parent 794dbacea3
commit 8b19f82c0b
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/aicurl.cpp
View File

@@ -495,7 +495,7 @@ void Stats::print(void)
// Each AICurlEasyRequestStateMachine has one AICurlEasyRequest member.
llassert(AICurlEasyRequest_count >= AICurlEasyRequestStateMachine_count);
// AIFIXME: is this really always the case? And why?
llassert(easy_handles <= ResponderBase_count);
llassert(easy_handles <= S32(ResponderBase_count));
}
} // namespace AICurlInterface

6
indra/llmessage/aicurlperhost.cpp
View File

@@ -92,13 +92,13 @@ void PerHostRequestQueue::release(PerHostRequestQueuePtr& instance)
bool PerHostRequestQueue::throttled() const
{
llassert(mAdded <= curl_concurrent_connections_per_host);
return mAdded == curl_concurrent_connections_per_host;
llassert(mAdded <= int(curl_concurrent_connections_per_host));
return mAdded == int(curl_concurrent_connections_per_host);
}
void PerHostRequestQueue::added_to_multi_handle(void)
{
llassert(mAdded < curl_concurrent_connections_per_host);
llassert(mAdded < int(curl_concurrent_connections_per_host));
++mAdded;
}

3
indra/newview/llagentcamera.cpp
View File

@@ -1844,8 +1844,9 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
}
static const LLCachedControl<bool> sg_ignore_sim_cam_consts("SGIgnoreSimulatorCameraConstraints",false);
if ( !mCameraCollidePlane.isExactlyZero()
&& !gSavedSettings.getBOOL("SGIgnoreSimulatorCameraConstraints")
&& !sg_ignore_sim_cam_consts
&& isAgentAvatarValid()
&& !gAgentAvatarp->isSitting())
{

2
indra/newview/llviewerobjectlist.cpp
View File

@@ -1471,7 +1471,7 @@ void LLViewerObjectList::updateActive(LLViewerObject *objectp)
}
else
{
llassert(idx < mActiveObjects.size());
llassert(idx < (S32)mActiveObjects.size());
llassert(mActiveObjects[idx] == objectp);
if (idx >= (S32)mActiveObjects.size() ||