From bca56ffbe2c2ad89b6164bcd5e42688a608a35b5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 25 Apr 2010 22:11:20 -0700
Subject: Removed hardcoded references to secondlife.com/support

---
 linden/indra/newview/llappviewer.cpp             | 10 ++++++++--
 linden/indra/newview/llassetuploadresponders.cpp |  3 +--
 linden/indra/newview/llxmlrpctransaction.cpp     |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index a0700a9..e55d4ab 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3161,6 +3161,12 @@ void LLAppViewer::badNetworkHandler()
 	LLAppViewer::handleSyncViewerCrash();
 	LLAppViewer::handleViewerCrash();
 
+	std::string grid_support_msg = "";
+	if (!gHippoGridManager->getCurrentGrid()->getSupportUrl().empty())
+	{
+		grid_support_msg = "\n\nOr visit the gird support page at: \n " 
+			+ gHippoGridManager->getCurrentGrid()->getSupportUrl();
+	}
 	std::ostringstream message;
 	message <<
 		"The viewer has detected mangled network data indicative\n"
@@ -3170,8 +3176,8 @@ void LLAppViewer::badNetworkHandler()
 		"Try uninstalling and reinstalling to see if this resolves \n"
 		"the issue. \n"
 		" \n"
-		"If the problem continues, see the Tech Support FAQ at: \n"
-		"www.secondlife.com/support";
+		"If the problem continues, please report the issue at: \n"
+		"www.imprudenceviewer.org" << grid_support_msg;
 	forceDisconnect(message.str());
 }
 
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 700edb5..001d2e9 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -114,8 +114,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 	{
 		case 400:
 			args["FILE"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
-			args["REASON"] = "Error in upload request.  Please visit "
-				"http://secondlife.com/support for help fixing this problem.";
+			args["REASON"] = "Error in upload request.";
 			LLNotifications::instance().add("CannotUploadReason", args);
 			break;
 		case 500:
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index 400cd75..b993c99 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -416,7 +416,7 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status,
 			default:
 				// Usually this means that there's a problem with the login server,
 				// not with the client.  Direct user to status page.
-				// NOTE: these should really be gHippoGridManager->getCurrentGrid()->getGridNick()
+				// NOTE: these should really be gHippoGridManager->getCurrentGrid()->getGridName()
 				// but apparently that's broken as of 1.3 b2 -- MC
 				mStatusMessage =
 					"Despite our best efforts, something unexpected has gone wrong. \n"
@@ -432,7 +432,7 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status,
 void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code)
 {
 	std::string message;
-	std::string uri = "http://secondlife.com/community/support.php";
+	std::string uri = gHippoGridManager->getCurrentGrid()->getSupportUrl();
 	
 	switch (code)
 	{
-- 
cgit v1.1