aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-21 04:00:52 +0100
committerMelanie Thielker2014-11-21 04:00:52 +0100
commit80118ac0575ad6816f65ed7436ec4e0b384f231d (patch)
tree8f1597749206c5bec0c0fb71753f947ab1525aa2
parent dont do recoil on llRezObject called from attachments, as seem to happen (diff)
downloadopensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.zip
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.gz
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.bz2
opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.xz
Remove braindead "fix" that messed up intersim scripted giving.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs11
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs17
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs15
3 files changed, 31 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 03aaaac..3815c71 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -471,17 +471,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
471 /// <param name="im"></param> 471 /// <param name="im"></param>
472 private void OnGridInstantMessage(GridInstantMessage im) 472 private void OnGridInstantMessage(GridInstantMessage im)
473 { 473 {
474 // Check if it's a type of message that we should handle
475 if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
476 || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
477 || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
478 || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
479 return;
480
481 m_log.DebugFormat(
482 "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
483 (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
484
485 // Check if this is ours to handle 474 // Check if this is ours to handle
486 // 475 //
487 Scene scene = FindClientScene(new UUID(im.toAgentID)); 476 Scene scene = FindClientScene(new UUID(im.toAgentID));
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 6ee15ad..e6b14c6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -121,6 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
121 121
122 public void Initialise(IConfigSource config) 122 public void Initialise(IConfigSource config)
123 { 123 {
124 MainConsole.Instance.Commands.AddCommand("vivox", false, "vivox debug", "vivox debug <on>|<off>", "Set vivox debugging", HandleDebug);
124 125
125 m_config = config.Configs["VivoxVoice"]; 126 m_config = config.Configs["VivoxVoice"];
126 127
@@ -1335,5 +1336,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1335 result = String.Empty; 1336 result = String.Empty;
1336 return false; 1337 return false;
1337 } 1338 }
1339
1340 private void HandleDebug(string module, string[] cmd)
1341 {
1342 if (cmd.Length < 3)
1343 {
1344 MainConsole.Instance.Output("Error: missing on/off flag");
1345 return;
1346 }
1347
1348 if (cmd[2] == "on")
1349 m_dumpXml = true;
1350 else if (cmd[2] == "off")
1351 m_dumpXml = false;
1352 else
1353 MainConsole.Instance.Output("Error: only on and off are supported");
1354 }
1338 } 1355 }
1339} 1356}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5141e0e..aaf1170 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8540,6 +8540,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8540 8540
8541 public LSL_String llXorBase64Strings(string str1, string str2) 8541 public LSL_String llXorBase64Strings(string str1, string str2)
8542 { 8542 {
8543 int padding = 0;
8544
8543 string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; 8545 string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
8544 8546
8545 ScriptSleep(300); 8547 ScriptSleep(300);
@@ -8583,6 +8585,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8583 // than the decoded length of s1, simply perform a normal 8585 // than the decoded length of s1, simply perform a normal
8584 // decode and XOR 8586 // decode and XOR
8585 // 8587 //
8588 /*
8586 if (data2.Length >= data1.Length) 8589 if (data2.Length >= data1.Length)
8587 { 8590 {
8588 for (int pos = 0 ; pos < data1.Length ; pos++ ) 8591 for (int pos = 0 ; pos < data1.Length ; pos++ )
@@ -8590,10 +8593,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8590 8593
8591 return Convert.ToBase64String(data1); 8594 return Convert.ToBase64String(data1);
8592 } 8595 }
8596 */
8593 8597
8594 // Remove padding 8598 // Remove padding
8595 while (str1.EndsWith("=")) 8599 while (str1.EndsWith("="))
8600 {
8596 str1 = str1.Substring(0, str1.Length - 1); 8601 str1 = str1.Substring(0, str1.Length - 1);
8602 padding++;
8603 }
8597 while (str2.EndsWith("=")) 8604 while (str2.EndsWith("="))
8598 str2 = str2.Substring(0, str2.Length - 1); 8605 str2 = str2.Substring(0, str2.Length - 1);
8599 8606
@@ -8621,7 +8628,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8621 for (int pos = 0 ; pos < d1.Length ; pos++) 8628 for (int pos = 0 ; pos < d1.Length ; pos++)
8622 output += b64[d1[pos] ^ d2[pos % d2.Length]]; 8629 output += b64[d1[pos] ^ d2[pos % d2.Length]];
8623 8630
8624 while (output.Length % 3 > 0) 8631 // Here's a funny thing: LL blithely violate the base64
8632 // standard pretty much everywhere. Here, padding is
8633 // added only if the first input string had it, rather
8634 // than when the data actually needs it. This can result
8635 // in invalid base64 being returned. Go figure.
8636
8637 while (padding-- > 0)
8625 output += "="; 8638 output += "=";
8626 8639
8627 return output; 8640 return output;