Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

indra/newview/app_settings/settings.xml

@@ -1028,6 +1028,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>FSCreateCallingCards</key>
+    <map>
+      <key>Comment</key>
+      <string>Don't create calling cards when friending other avatars (requires restart)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   <key>FSSupportGroupChatPrefix3</key>
     <map>
       <key>Comment</key>

indra/newview/llpanelpeople.cpp

@@ -360,7 +360,8 @@ public:
 		// For notification when SIP online status changes.
 		LLVoiceClient::getInstance()->addObserver(this);
 		// <FS:Ansariel> Disconnect LLFriendCardsManager
-		//mInvObserver = new LLInventoryFriendCardObserver(this);
+		if (gSavedSettings.getBOOL("FSCreateCallingCards"))
+			mInvObserver = new LLInventoryFriendCardObserver(this);
 	}
 
 	~LLFriendListUpdater()
@@ -414,7 +415,7 @@ public:
 private:
 	U32 mMask;
 	// <FS:Ansariel> Disconnect LLFriendCardsManager
-	//LLInventoryFriendCardObserver* mInvObserver;
+	LLInventoryFriendCardObserver* mInvObserver{ nullptr };
 	bool mIsActive;
 
 	/**

indra/newview/llstartup.cpp

@@ -3100,7 +3100,10 @@ bool idle_startup()
 		FSFloaterWearableFavorites::initCategory();
 
 		// <FS:Ansariel> Bypass the calling card sync-crap to create the agent's calling card
-		LLFriendCardsManager::createAgentCallingCard();
+		if (!gSavedSettings.getBOOL("FSCreateCallingCards"))
+		{
+			LLFriendCardsManager::createAgentCallingCard();
+		}
 
 		// Let the map know about the inventory.
 		LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();