Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

indra/llrender/llimagegl.cpp

@@ -1428,6 +1428,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
             {
             case GL_UNSIGNED_BYTE:
             case GL_BYTE:
+            case GL_UNSIGNED_INT_8_8_8_8_REV:
                 type_width = 1;
                 break;
             case GL_UNSIGNED_SHORT:

indra/newview/llmaniptranslate.cpp

@@ -267,11 +267,7 @@ void LLManipTranslate::restoreGL()
 				}
 			}
 		}
-#ifdef LL_WINDOWS
 		LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_BYTE, d);
-#else
-		LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, d);
-#endif
 		rez = rez >> 1;
 		mip++;
 	}