livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Ansariel 2014-02-27 11:32:35 +01:00
parent 5bf83bb182
commit fe0df4b2ee
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/app_settings/settings_per_account.xml
View File

@ -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>

6
indra/newview/fslslbridge.cpp
View File

@ -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");