[sldev-commits] r2348 - projects/2009/http-texture/indra/newview

merov.linden at svn.secondlife.com merov.linden at svn.secondlife.com
Tue Jun 2 16:38:15 PDT 2009


Author: merov.linden
Date: 2009-06-02 18:38:14 -0500 (Tue, 02 Jun 2009)
New Revision: 2348

Modified:
   projects/2009/http-texture/indra/newview/llvovolume.cpp
Trac: http://svn.secondlife.com/trac/linden/changeset/2348
Log:
VWR-11815 (DEV-26896) : brought back some 1.22 changes that were trampled on during http-texture-10 merges. Reviewed by Bao.

Modified: projects/2009/http-texture/indra/newview/llvovolume.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llvovolume.cpp	2009-06-02 22:34:41 UTC (rev 2347)
+++ projects/2009/http-texture/indra/newview/llvovolume.cpp	2009-06-02 23:38:14 UTC (rev 2348)
@@ -721,10 +721,10 @@
 			// corrupted volume... don't update the sculpty
 			return;
 		}
-		else if (current_discard > max_discard)
+		else if (current_discard > MAX_DISCARD_LEVEL)
 		{
 			llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
-				<< " is more than than allowed max of " << max_discard << llendl;
+				<< " is more than than allowed max of " << MAX_DISCARD_LEVEL << llendl;
 			
 			// corrupted volume... don't update the sculpty			
 			return;



More information about the sldev-commits mailing list