From 72c4c523726693126e7ed87e483103009b9e247d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 12 Feb 2011 23:33:11 +0100
Subject: [PATCH] Assorted fixes

---
 indra/llmessage/llcachename.cpp         |  3 ++-
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llimpanel.cpp             |  2 +-
 indra/newview/llimview.cpp              |  7 +++++++
 indra/newview/llpanellogin.cpp          |  2 +-
 indra/newview/llviewermessage.cpp       | 13 +------------
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index dc628e79d..bff30f4b6 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -521,7 +521,8 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 {
 	std::string first_name, last_name;
 	BOOL res = getName(id, first_name, last_name);
-	fullname = first_name + " " + last_name;
+	if(res)
+		fullname = first_name + " " + last_name;
 	return res;
 }
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4d1c1d76e..d2bd71f55 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20,6 +20,17 @@
     <key>Value</key>
     <string />
   </map>
+  <key>ShowcaseURLDefault</key>
+  <map>
+    <key>Comment</key>
+    <string>URL to load for the Showcase tab in Second Life</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://secondlife.com/app/showcase/index.php?</string>
+  </map>
 
   <key>CheckForGridUpdates</key>
   <map>
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index ee086ac1a..4047dba84 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1620,7 +1620,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 		{
 			std::string show_name = name;
 			LLAvatarName avatar_name;
-			if ((LLUUID::null != source) &&
+			if (source.notNull() &&
 				LLAvatarNameCache::get(source, &avatar_name))
 			{
 				static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 12b7ee0c2..b97179775 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -577,6 +577,13 @@ void LLIMMgr::addMessage(
 		other_participant_id = LLUUID::null;
 	}
 
+	//This is for InWorldz glitch.
+	if( other_participant_id == session_id )
+	{
+		other_participant_id = LLUUID::null;
+	}
+	
+
 	LLFloaterIMPanel* floater;
 	LLUUID new_session_id = session_id;
 	if (new_session_id.isNull())
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index ece784d2d..5fae31fbb 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -849,7 +849,7 @@ void LLPanelLogin::refreshLoginPage()
 	// kick off a request to grab the url manually
 	gResponsePtr = LLIamHereLogin::build(sInstance);
 
-	std::string login_page = "http://phoenixviewer.com/app/login/"; //gHippoGridManager->getConnectedGrid()->getLoginPage();
+	std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
 	if (!login_page.empty()) {
 		LLHTTPClient::head(login_page, gResponsePtr);
 	} else {
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 49121fe63..9a04d3719 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1941,18 +1941,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				true);
 
 			// pretend this is chat generated by self, so it does not show up on screen
-			std::string prepend_msg;
-			if (gAgent.isInGroup(session_id)&& gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"))
-			{
-				prepend_msg = "[";
-				prepend_msg += std::string((char*)binary_bucket);
-				prepend_msg += "] ";
-			}
-			else
-			{
-				prepend_msg = std::string("IM: ");
-			}
-			chat.mText = prepend_msg + name + separator_string + message.substr(message_offset);
+			chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
 			LLFloaterChat::addChat( chat, TRUE, TRUE );
 		}
 		else if (from_id.isNull())