3 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 91f99d7b47..05c7e6caa5 100755
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -72,7 +72,7 @@ LLConversation::LLConversation(const LLIMModel::LLIMSession& session)
 	mConversationType(session.mSessionType),
 	mConversationName(session.mName),
 	mHistoryFileName(session.mHistoryFileName),
-	mSessionID(session.isOutgoingAdHoc() ? session.generateOutgouigAdHocHash() : session.mSessionID),
+	mSessionID(session.isOutgoingAdHoc() ? session.generateOutgoingAdHocHash() : session.mSessionID),
 	mParticipantID(session.mOtherParticipantID),
 	mHasOfflineIMs(session.mHasOfflineMessage)
 {
@@ -313,7 +313,7 @@ LLConversation* LLConversationLog::findConversation(const LLIMModel::LLIMSession
 {
 	if (session)
 	{
-		const LLUUID session_id = session->isOutgoingAdHoc() ? session->generateOutgouigAdHocHash() : session->mSessionID;
+		const LLUUID session_id = session->isOutgoingAdHoc() ? session->generateOutgoingAdHocHash() : session->mSessionID;
 
 		conversations_vec_t::iterator conv_it = mConversations.begin();
 		for(; conv_it != mConversations.end(); ++conv_it)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 2871dbd70d..7aec056b0a 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -785,7 +785,7 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline()
 	return !mOtherParticipantIsAvatar;
 }
 
-LLUUID LLIMModel::LLIMSession::generateOutgouigAdHocHash() const
+LLUUID LLIMModel::LLIMSession::generateOutgoingAdHocHash() const
 {
 	LLUUID hash = LLUUID::null;
 
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 382b0e0a77..1426bada95 100755
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -93,7 +93,7 @@ public:
 		bool isGroupSessionType() const { return mSessionType == GROUP_SESSION;}
 		bool isAvalineSessionType() const { return mSessionType == AVALINE_SESSION;}
 
-		LLUUID generateOutgouigAdHocHash() const;
+		LLUUID generateOutgoingAdHocHash() const;
 
 		//*TODO make private
 		/** ad-hoc sessions involve sophisticated chat history file naming schemes */