From 3ba9cf20486ac80276f262c57a9280dc875504eb Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 3 Sep 2013 19:11:20 -0700
Subject: ACME-789: Remove SLShareHost setting from settings.xml

---
 indra/newview/app_settings/settings.xml | 11 -----------
 indra/newview/llfacebookconnect.cpp     | 15 ---------------
 2 files changed, 26 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 098693eb98..b199929d91 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3533,17 +3533,6 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
-    <key>SLShareHost</key>
-    <map>
-      <key>Comment</key>
-      <string>Host for contacting SL FB services</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
-    </map>  
     <key>FastCacheFetchEnabled</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 451c0f5767..9c70757278 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -32,7 +32,6 @@
 #include "llagent.h"
 #include "llcallingcard.h"			// for LLAvatarTracker
 #include "llcommandhandler.h"
-#include "llcontrol.h"
 #include "llhttpclient.h"
 #include "llnotificationsutil.h"
 #include "llurlaction.h"
@@ -49,8 +48,6 @@ boost::scoped_ptr<LLEventPump> LLFacebookConnect::sStateWatcher(new LLEventStrea
 boost::scoped_ptr<LLEventPump> LLFacebookConnect::sInfoWatcher(new LLEventStream("FacebookConnectInfo"));
 boost::scoped_ptr<LLEventPump> LLFacebookConnect::sContentWatcher(new LLEventStream("FacebookConnectContent"));
 
-extern LLControlGroup gSavedSettings;
-
 // Local functions
 void log_facebook_connect_error(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description)
 {
@@ -360,18 +357,6 @@ void LLFacebookConnect::openFacebookWeb(std::string url)
 std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, bool include_read_from_master)
 {
 	static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
-    
-	//*TODO : Remove this code along with extern and llcontrol.h header
-	std::string host = gSavedSettings.getString("SLShareHost");
-    if (!host.empty())
-    {
-        sFacebookConnectUrl = host + "/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho
-    }
-    else
-    {
-        sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
-    }
-    //End removable part
 
 	std::string url = sFacebookConnectUrl + route;
 	if (include_read_from_master && mReadFromMaster)
-- 
cgit v1.2.3