diff options
Diffstat (limited to '')
-rw-r--r-- | 1chatter.lsl | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/1chatter.lsl b/1chatter.lsl index b41df53..3c89a6f 100644 --- a/1chatter.lsl +++ b/1chatter.lsl | |||
@@ -11,6 +11,7 @@ key ScriptKey; | |||
11 | key LibraryKey; | 11 | key LibraryKey; |
12 | key Owner; | 12 | key Owner; |
13 | string URL; | 13 | string URL; |
14 | key grid; | ||
14 | 15 | ||
15 | list Commands; | 16 | list Commands; |
16 | integer cNAME = 0; | 17 | integer cNAME = 0; |
@@ -1106,6 +1107,8 @@ integer doThing(key id, string command, string fr, string cmd, string data, inte | |||
1106 | dt = llListReplaceList(dt, [], 0, 0); | 1107 | dt = llListReplaceList(dt, [], 0, 0); |
1107 | addEvent(time, fr + llDumpList2String(dt, " "), id); | 1108 | addEvent(time, fr + llDumpList2String(dt, " "), id); |
1108 | } | 1109 | } |
1110 | else if ("OHSILLYPROBE" == cmd) | ||
1111 | llMessageLinked(LINK_SET, DEBUG_CHANNEL, "OHSILLYPROBE", llGetKey()); | ||
1109 | else | 1112 | else |
1110 | { | 1113 | { |
1111 | sendScript(them, lCMD, fr, [source, id, command, cmd, data]); | 1114 | sendScript(them, lCMD, fr, [source, id, command, cmd, data]); |
@@ -1276,6 +1279,7 @@ init() | |||
1276 | VelTime = llGetTimeOfDay(); | 1279 | VelTime = llGetTimeOfDay(); |
1277 | VelPos = llGetPos(); | 1280 | VelPos = llGetPos(); |
1278 | addEvent(300, "Musers", ScriptKey); | 1281 | addEvent(300, "Musers", ScriptKey); |
1282 | addEvent(30, "*.OHSILLYPROBE", ScriptKey); | ||
1279 | URLrequestID = llRequestURL(); | 1283 | URLrequestID = llRequestURL(); |
1280 | } | 1284 | } |
1281 | 1285 | ||
@@ -1288,6 +1292,7 @@ default | |||
1288 | d("\n\n1chatter resetting client scripts @ " + (string) Start + "\n"); | 1292 | d("\n\n1chatter resetting client scripts @ " + (string) Start + "\n"); |
1289 | ScriptName = llGetScriptName(); ScriptKey = llGetInventoryKey(ScriptName); | 1293 | ScriptName = llGetScriptName(); ScriptKey = llGetInventoryKey(ScriptName); |
1290 | LibraryKey = ScriptKey; | 1294 | LibraryKey = ScriptKey; |
1295 | grid = osGetGridName(); | ||
1291 | init(); | 1296 | init(); |
1292 | } | 1297 | } |
1293 | 1298 | ||
@@ -1305,6 +1310,13 @@ d("\n\n1chatter resetting client scripts @ " + (string) Start + "\n"); | |||
1305 | llResetScript(); | 1310 | llResetScript(); |
1306 | if (change & CHANGED_REGION) | 1311 | if (change & CHANGED_REGION) |
1307 | { | 1312 | { |
1313 | string newGrid = osGetGridName(); | ||
1314 | |||
1315 | if (newGrid != grid) | ||
1316 | { | ||
1317 | grid = newGrid; | ||
1318 | addEvent(30, "*.OHSILLYPROBE", ScriptKey); | ||
1319 | } | ||
1308 | llReleaseURL(URL); | 1320 | llReleaseURL(URL); |
1309 | URL = ""; | 1321 | URL = ""; |
1310 | URLrequestID = llRequestURL(); | 1322 | URLrequestID = llRequestURL(); |
@@ -1501,8 +1513,9 @@ d("lSCAN " + llDumpList2String(input, " ~ ")); | |||
1501 | // Catch OhSillyThreatLevel messages, from the probe. | 1513 | // Catch OhSillyThreatLevel messages, from the probe. |
1502 | if (channel == DEBUG_CHANNEL) | 1514 | if (channel == DEBUG_CHANNEL) |
1503 | { | 1515 | { |
1504 | key root = llList2Key(llGetObjectDetails(id, [OBJECT_ROOT]), 0); | 1516 | llOwnerSay(message); |
1505 | if (llGetLinkKey(LINK_ROOT) == root) | 1517 | // key root = llList2Key(llGetObjectDetails(id, [OBJECT_ROOT]), 0); |
1518 | // if (llGetLinkKey(LINK_ROOT) == root) | ||
1506 | { | 1519 | { |
1507 | integer f = llSubStringIndex(message, "permission denied. "); | 1520 | integer f = llSubStringIndex(message, "permission denied. "); |
1508 | if (-1 != f) | 1521 | if (-1 != f) |
@@ -1512,7 +1525,7 @@ d("lSCAN " + llDumpList2String(input, " ~ ")); | |||
1512 | if (("OSSL" == llList2String(e, 0)) && ("Runtime" == llList2String(e, 1)) && ("Error:" == llList2String(e, 2))) | 1525 | if (("OSSL" == llList2String(e, 0)) && ("Runtime" == llList2String(e, 1)) && ("Error:" == llList2String(e, 2))) |
1513 | function = llList2String(e, 3); | 1526 | function = llList2String(e, 3); |
1514 | llMessageLinked(LINK_SET, DEBUG_CHANNEL, function, "0"); | 1527 | llMessageLinked(LINK_SET, DEBUG_CHANNEL, function, "0"); |
1515 | llOwnerSay("Found naughty function " + function); | 1528 | llOwnerSay("Found naughty function " + function); |
1516 | return; | 1529 | return; |
1517 | } | 1530 | } |
1518 | } | 1531 | } |