diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-25 11:48:59 -0600 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-25 11:48:59 -0600 | 
| commit | d9d696de388ab7ce0626a18ce461ce7e84b86793 (patch) | |
| tree | d280e2b4e6e25d917928303727fe68a79f950ff3 /indra | |
| parent | 0857eda4f68d10a3cf46ffe67d5739c0c6d25f76 (diff) | |
trivial: convert to unix endings.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index fdeb65e5a3..23660dd3ce 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1178,9 +1178,9 @@ F32 LLViewerRegion::createVisibleObjects(F32 max_time)  		return max_time;  	}	 -	//object projected area threshold
 -	F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio();
 -	F32 projection_threshold = pixel_meter_ratio > 0.f ? projection_area_cutoff / pixel_meter_ratio : 0.f;
 +	//object projected area threshold +	F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio(); +	F32 projection_threshold = pixel_meter_ratio > 0.f ? projection_area_cutoff / pixel_meter_ratio : 0.f;  	projection_threshold *= projection_threshold;  	S32 throttle = sNewObjectCreationThrottle; @@ -1191,9 +1191,9 @@ F32 LLViewerRegion::createVisibleObjects(F32 max_time)  	{  		LLVOCacheEntry* vo_entry = *iter;		 -		if(vo_entry->getSceneContribution() < projection_threshold)
 -		{
 -			break;
 +		if(vo_entry->getSceneContribution() < projection_threshold) +		{ +			break;  		}  		if(vo_entry->getState() < LLVOCacheEntry::WAITING) | 
