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

FIRE-12524: Engage movelock at login (which was set in previous session before logging out) only when using Firestorm viewer, so it can be turned off via its functions if needed; Thanks to Dan Threebeards for the idea 

Also, inform user about that at-login-relocking, if logging in on Firestorm - to avoid surprise
Northspring 2014-01-08 14:56:58 +01:00
parent 047dcc205d
commit 5780df0a5f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt
View File

@ -1,4 +1,4 @@
//http bridge script v.2.5
//http bridge script v.2.6
//Firestorm
//Tozh Taurog, Arrehn Oberlander, Tonya Souther
@ -19,7 +19,7 @@
integer UNKNOWN_VIEWER = 1;
integer META_CONTROL = 1024; // Control value to do nothing; for no-script sims
string bridgeAuth = "BRIDGEKEY"; // Filled in dynamically
string bridgeVersion = "2.5"; // This should match fslslbridge.cpp
string bridgeVersion = "2.6"; // This should match fslslbridge.cpp
string bridgeURL;
string latestURL;
integer debug = FALSE;
@ -687,9 +687,12 @@ default
}
on_rez(integer i)
// We don't want to be rezzed without being attached. Insure we don't create litter.
{
// We don't want to be rezzed without being attached. Insure we don't create litter.
llSetPrimitiveParams([PRIM_TEMP_ON_REZ, TRUE]);
// Force Movelock variable to false here and allow attach() to decide via initBridge(), if we're on Firestorm and login relock can be turned off if needed.
// on_rez() will be triggered prior to attach() when attaching from inventory or during login, but not prior to state_entry().
useMoveLock = FALSE;
}
attach(key k)

12
indra/newview/fslslbridge.cpp
View File

@ -64,10 +64,10 @@
#define FS_BRIDGE_FOLDER "#LSL Bridge"
#define FS_BRIDGE_CONTAINER_FOLDER "Landscaping"
#define FS_BRIDGE_MAJOR_VERSION 2
#define FS_BRIDGE_MINOR_VERSION 5
#define FS_BRIDGE_MINOR_VERSION 6
#define FS_MAX_MINOR_VERSION 99
//current script version is 2.5
//current script version is 2.6
const std::string UPLOAD_SCRIPT_CURRENT = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt";
//
@ -230,6 +230,14 @@ bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID
updateBoolSettingValue("UseMoveLock");
updateBoolSettingValue("FSPublishRadarTag");
mIsFirstCallDone = true;
// <FS:PP> Inform user, if movelock was enabled at login
if (gSavedSettings.getBOOL("UseMoveLock"))
{
reportToNearbyChat(LLTrans::getString("MovelockEnabled"));
}
// </FS:PP>
}
// <FS:PP> FIRE-11924: Refresh movelock position after region change (crossing/teleporting), if lock was enabled
// Not called right after logging in, and only if movelock was enabled during transition