From fe0df4b2eec9874f87e50c9645115a9388752a84 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 27 Feb 2014 11:32:35 +0100
Subject: [PATCH] Get rid of annoying bridge recreation each time after logging
 in from a different computer or grid: Instead of generating a random UUID
 that is stored on the computer, use a UUID that is random and unique to each
 avatar -> bridge folder UUID

---
 .../newview/app_settings/settings_per_account.xml | 15 ---------------
 indra/newview/fslslbridge.cpp                     |  6 ++----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 9ce0f69465..742e6a2ac9 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -187,21 +187,6 @@
         <key>Value</key>
             <string>The Resident you messaged is currently away from keyboard. Your message will still be shown in their IM panel for later viewing.</string>
         </map>
-    <key>FSLSLBridgeUUID</key>
-        <map>
-        <key>Comment</key>
-            <string>Current bridge UUID</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>HideFromEditor</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>String</string>
-        <key>Value</key>
-            <string>00000</string>
-        <key>Backup</key>
-            <integer>0</integer>
-        </map>
     <key>FSMutedAvatarResponse</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index 94a67499e1..825b895893 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -155,7 +155,7 @@ bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID
 		return false;
 	}
 	std::string tag = message.substr(0, tagend + 1);
-	std::string ourBridge = gSavedPerAccountSettings.getString("FSLSLBridgeUUID");
+	std::string ourBridge = findFSCategory().asString();
 	//</FS:TS> FIRE-962
 	
 	bool status = false;
@@ -920,9 +920,7 @@ std::string FSLSLBridgeScriptCallback::prepUploadFile()
 	std::string bridgeScript( (char const*)&vctData[0] );
 
 	std::string bridgekey = "BRIDGEKEY";
-	std::string newauth = LLUUID::generateNewID().asString();
-	bridgeScript.replace(bridgeScript.find(bridgekey), bridgekey.length(), newauth);
-	gSavedPerAccountSettings.setString("FSLSLBridgeUUID", newauth);
+	bridgeScript.replace(bridgeScript.find(bridgekey), bridgekey.length(), FSLSLBridge::getInstance()->findFSCategory().asString());
 
 	LLFILE *fpOut = LLFile::fopen(fNew, "wt");