Minor improvements from Henri Beauchamp (Cool VL)

Tue, 27 Dec 2011 12:39:25 +0100

author
Ansariel
date
Tue, 27 Dec 2011 12:39:25 +0100
changeset 1614
b6ad16cb1945
parent 1613
2615ecde1159
child 1615
2388998e3bb6

Minor improvements from Henri Beauchamp (Cool VL)

indra/llimage/llimage.cpp file | annotate | diff | revisions
indra/newview/llappviewer.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llimage/llimage.cpp	Tue Dec 27 12:38:49 2011 +0100
     1.2 +++ b/indra/llimage/llimage.cpp	Tue Dec 27 12:39:25 2011 +0100
     1.3 @@ -180,7 +180,8 @@
     1.4  		mData = new U8[size];
     1.5  		if (!mData)
     1.6  		{
     1.7 -			llwarns << "allocate image data: " << size << llendl;
     1.8 +			llwarns << "Could not allocate image data for requested size: "
     1.9 +					<< size << llendl;
    1.10  			size = 0 ;
    1.11  			mWidth = mHeight = 0 ;
    1.12  			mBadBufferAllocation = true ;
     2.1 --- a/indra/newview/llappviewer.cpp	Tue Dec 27 12:38:49 2011 +0100
     2.2 +++ b/indra/newview/llappviewer.cpp	Tue Dec 27 12:39:25 2011 +0100
     2.3 @@ -1430,8 +1430,7 @@
     2.4  
     2.5  		// shut down the audio subsystem
     2.6  
     2.7 -		bool want_longname = false;
     2.8 -		if (gAudiop->getDriverName(want_longname) == "FMOD")
     2.9 +		if (gAudiop->getDriverName(false) == "FMOD")
    2.10  		{
    2.11  			// This hack exists because fmod likes to occasionally
    2.12  			// crash or hang forever when shutting down, for no

mercurial