diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-08-20 14:28:03 +0300 | 
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-08-20 14:28:03 +0300 | 
| commit | ea4b5e60d92b0b1349115e2722f028cd0cf2da18 (patch) | |
| tree | d97cad26a5a6e28101a2c119b50e2892180f45f5 | |
| parent | cf93c1c81d35d79279bb9ddc7445afac09f3d57f (diff) | |
Fixed line endings in llwindowwin32.cpp
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index f14cf26ce9..26bc819aab 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -3976,7 +3976,7 @@ F32 LLWindowWin32::getSystemUISize()  		{  			pGPDA(hProcess, &dpi_awareness);  			if (dpi_awareness == PROCESS_PER_MONITOR_DPI_AWARE) -			{
 +			{  				POINT    pt;  				UINT     dpix = 0, dpiy = 0;  				HRESULT  hr = E_FAIL; @@ -3988,19 +3988,19 @@ F32 LLWindowWin32::getSystemUISize()  				pt.y = (rect.top + rect.bottom) / 2;  				hMonitor = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);  				hr = pGDFM(hMonitor, MDT_EFFECTIVE_DPI, &dpix, &dpiy); -				if (hr == S_OK)
 -				{
 -					scale_value = dpix / DEFAULT_DPI;
 -				}
 -				else
 -				{
 -					LL_WARNS() << "Could not determine DPI for monitor. Setting scale to default 100 %" << LL_ENDL;
 -					scale_value = 1.0f;
 +				if (hr == S_OK) +				{ +					scale_value = dpix / DEFAULT_DPI; +				} +				else +				{ +					LL_WARNS() << "Could not determine DPI for monitor. Setting scale to default 100 %" << LL_ENDL; +					scale_value = 1.0f;  				}  			}  			else  			{ -				LL_WARNS() << "Process is not per-monitor DPI-aware. Setting scale to default 100 %" << LL_ENDL;
 +				LL_WARNS() << "Process is not per-monitor DPI-aware. Setting scale to default 100 %" << LL_ENDL;  				scale_value = 1.0f;  			}  		}  | 
