diff options
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 6 | 
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 501ad0ad1b..6d73a75b74 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -680,9 +680,9 @@ public:  				avatar->calculateUpdateRenderComplexity(); // Make sure the numbers are up-to-date  				trunc_name = utf8str_truncate(avatar->getFullname(), 16); -				addText(xpos, ypos, llformat("%s : rez %d, complexity %d, bytes %d area %.2f", +				addText(xpos, ypos, llformat("%s : %s, complexity %d, bytes %d area %.2f",  					trunc_name.c_str(), -					avatar->getRezzedStatus(), +                    LLVOAvatar::rezStatusToString(avatar->getRezzedStatus()).c_str(),  					avatar->getVisualComplexity(),  					avatar->getAttachmentGeometryBytes(),  					avatar->getAttachmentSurfaceArea())); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 90ae3686be..a073ac10b8 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -984,8 +984,8 @@ std::string LLVOAvatar::rezStatusToString(S32 rez_status)  {  	if (rez_status==0) return "cloud";  	if (rez_status==1) return "gray"; -	if (rez_status==2) return "textured"; -	if (rez_status==3) return "textured_and_downloaded"; +	if (rez_status==2) return "downloading"; +	if (rez_status==3) return "full";  	return "unknown";  } @@ -6219,7 +6219,7 @@ bool LLVOAvatar::getIsCloud() const  void LLVOAvatar::updateRezzedStatusTimers()  {  	// State machine for rezzed status. Statuses are -1 on startup, 0 -	// = cloud, 1 = gray, 2 = textured, 3 = textured_and_downloaded. +	// = cloud, 1 = gray, 2 = downloading, 3 = full.  	// Purpose is to collect time data for each it takes avatar to reach  	// various loading landmarks: gray, textured (partial), textured fully.  | 
