Merge

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index caf9c08057..078c2518c6 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -267,20 +267,20 @@ protected:
 	}
 
 private:
-	std::string appendTime(const LLChat& chat)

-	{

-		time_t utc_time;

-		utc_time = time_corrected();

-		std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["

-			+LLTrans::getString("TimeMin")+"] ";

-

-		LLSD substitution;

-

-		substitution["datetime"] = (S32) utc_time;

-		LLStringUtil::format (timeStr, substitution);

-

-		return timeStr;

-	}

+	std::string appendTime(const LLChat& chat)
+	{
+		time_t utc_time;
+		utc_time = time_corrected();
+		std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
+			+LLTrans::getString("TimeMin")+"] ";
+
+		LLSD substitution;
+
+		substitution["datetime"] = (S32) utc_time;
+		LLStringUtil::format (timeStr, substitution);
+
+		return timeStr;
+	}
 
 	void setTimeField(const LLChat& chat)
 	{
@@ -302,7 +302,7 @@ private:
 		time_box->translate(delta_pos_x, delta_pos_y);
 
 		//... & change width of the name control
-		LLTextBox* user_name = getChild<LLTextBox>("user_name");
+		LLView* user_name = getChild<LLView>("user_name");
 		const LLRect& user_rect = user_name->getRect();
 		user_name->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
 	}