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

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llrender/llrender2dutils.cpp
View File

@@ -342,7 +342,7 @@ void gl_draw_image( S32 x, S32 y, LLTexture* image, const LLColor4& color, const
{
if (NULL == image)
{
llwarns << "image == NULL; aborting function" << llendl;
LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
return;
}
gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), 0.f, image, color, uv_rect );
@@ -352,7 +352,7 @@ void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLTexture* image,
{
if (NULL == image)
{
llwarns << "image == NULL; aborting function" << llendl;
LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
return;
}
gl_draw_scaled_rotated_image( x, y, width, height, 0.f, image, color, uv_rect );
@@ -362,7 +362,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border
{
if (NULL == image)
{
llwarns << "image == NULL; aborting function" << llendl;
LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
return;
}
@@ -380,7 +380,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
if (NULL == image)
{
llwarns << "image == NULL; aborting function" << llendl;
LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
return;
}
@@ -639,7 +639,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
{
if (NULL == image)
{
llwarns << "image == NULL; aborting function" << llendl;
LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
return;
}