From 3b0e95bf3c36896b21cd6e82bda2d6ceaf356320 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 28 Jan 2010 20:10:40 +0200
Subject: Renamed some members of LLToastIMPanel to make them self-explanatory.

--HG--
branch : product-engine
---
 indra/newview/lltoastimpanel.cpp | 14 +++++++-------
 indra/newview/lltoastimpanel.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index d62017cc2f..7717ae9e01 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -41,14 +41,14 @@ const S32 LLToastIMPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT	= 6;
 
 //--------------------------------------------------------------------------
 LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notification),
-								mAvatar(NULL), mUserName(NULL),
+								mAvatarIcon(NULL), mAvatarName(NULL),
 								mTime(NULL), mMessage(NULL)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_instant_message.xml");
 
 	LLIconCtrl* sys_msg_icon = getChild<LLIconCtrl>("sys_msg_icon");
-	mAvatar = getChild<LLAvatarIconCtrl>("avatar_icon");
-	mUserName = getChild<LLTextBox>("user_name");
+	mAvatarIcon = getChild<LLAvatarIconCtrl>("avatar_icon");
+	mAvatarName = getChild<LLTextBox>("user_name");
 	mTime = getChild<LLTextBox>("time_box");
 	mMessage = getChild<LLTextBox>("message");
 
@@ -77,22 +77,22 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 		mMessage->setValue(p.message);
 	}
 
-	mUserName->setValue(p.from);
+	mAvatarName->setValue(p.from);
 	mTime->setValue(p.time);
 	mSessionID = p.session_id;
 	mNotification = p.notification;
 
 	if(p.from == SYSTEM_FROM)
 	{
-		mAvatar->setVisible(FALSE);
+		mAvatarIcon->setVisible(FALSE);
 		sys_msg_icon->setVisible(TRUE);
 	}
 	else
 	{
-		mAvatar->setVisible(TRUE);
+		mAvatarIcon->setVisible(TRUE);
 		sys_msg_icon->setVisible(FALSE);
 
-		mAvatar->setValue(p.avatar_id);
+		mAvatarIcon->setValue(p.avatar_id);
 	}
 
 	S32 maxLinesCount;
diff --git a/indra/newview/lltoastimpanel.h b/indra/newview/lltoastimpanel.h
index 53661f2cf6..42d9a97c3f 100644
--- a/indra/newview/lltoastimpanel.h
+++ b/indra/newview/lltoastimpanel.h
@@ -63,8 +63,8 @@ private:
 
 	LLNotificationPtr	mNotification;
 	LLUUID				mSessionID;
-	LLAvatarIconCtrl*	mAvatar;
-	LLTextBox*			mUserName;
+	LLAvatarIconCtrl*	mAvatarIcon;
+	LLTextBox*			mAvatarName;
 	LLTextBox*			mTime;
 	LLTextBox*			mMessage;
 };
-- 
cgit v1.2.3