diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index c11675fa48..55c5b4531b 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -763,8 +763,8 @@ LLRender::LLRender()
mCurrAlphaFunc = CF_DEFAULT;
mCurrAlphaFuncVal = 0.01f;
- mCurrBlendSFactor = BF_SOURCE_ALPHA;
- mCurrBlendDFactor = BF_ONE_MINUS_SOURCE_ALPHA;
+ mCurrBlendSFactor = BF_ONE;
+ mCurrBlendDFactor = BF_ZERO;
}
LLRender::~LLRender()
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 2ba4478376..b348ec2d29 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -710,19 +710,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
v = LLVector3(offset_x, offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(-offset_x, offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2f(v.mV[0], v.mV[1] );
}
gGL.end();
gGL.popUIMatrix();
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7e4ab1a872..4210760223 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7452,7 +7452,7 @@
Type
Boolean
Value
- 1
+ 0
RenderUseFarClip