Fix some more slurl silliness.

indra/newview/llchathistory.cpp

@@ -70,9 +70,6 @@ static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history");
 
 const static std::string NEW_LINE(rawstr_to_utf8("\n"));
 
-const static std::string SLURL_APP_AGENT = "secondlife:///app/agent/";
-const static std::string SLURL_ABOUT = "/about";
-
 // support for secondlife:///app/objectim/{UUID}/ SLapps
 class LLObjectIMHandler : public LLCommandHandler
 {
@@ -1124,7 +1121,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		//*HACK getting rid of redundant sender names in system notifications sent using sender name (see EXT-5010)
 		if (use_plain_text_chat_history && !from_me && chat.mFromID.notNull())
 		{
-			std::string slurl_about = SLURL_APP_AGENT + chat.mFromID.asString() + SLURL_ABOUT;
+			std::string slurl_about = LLSLURL("agent", chat.mFromID, "about").getSLURLString();
 			if (message.length() > slurl_about.length() && 
 				message.compare(0, slurl_about.length(), slurl_about) == 0)
 			{

indra/newview/llinspectremoteobject.cpp

@@ -35,6 +35,7 @@
 #include "llui.h"
 #include "lluictrl.h"
 #include "llurlaction.h"
+#include "llviewernetwork.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // LLInspectRemoteObject
@@ -173,7 +174,7 @@ void LLInspectRemoteObject::update()
 	std::string url;
 	if (! mSLurl.empty())
 	{
-		url = "secondlife:///app/teleport/" + mSLurl;
+		url = llformat("%s/teleport/%s", LLGridManager::getInstance()->getAppSLURLBase().c_str(), mSLurl.c_str());
 	}
 	getChild<LLUICtrl>("object_slurl")->setValue(url);
 

indra/newview/llslurl.cpp

@@ -29,7 +29,6 @@
 
 #include "llslurl.h"
 
-#include "llpanellogin.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "llfiltersd2xmlrpc.h"