diff options
| author | Melanie | 2010-10-24 17:21:16 +0200 |
|---|---|---|
| committer | Melanie | 2010-10-24 17:21:16 +0200 |
| commit | 2f0a3391eebd19d47f7a92a88be060e03e51e356 (patch) | |
| tree | 300efd3971075450a9bee650d1c854047e051bb0 /OpenSim/Region | |
| parent | Change the results from llGetPrimitiveParams to be the same as SL for (diff) | |
| parent | Prevent an exception if a string passed into llXorBase64StringsCorrect is not (diff) | |
| download | opensim-SC-2f0a3391eebd19d47f7a92a88be060e03e51e356.zip opensim-SC-2f0a3391eebd19d47f7a92a88be060e03e51e356.tar.gz opensim-SC-2f0a3391eebd19d47f7a92a88be060e03e51e356.tar.bz2 opensim-SC-2f0a3391eebd19d47f7a92a88be060e03e51e356.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 94d3dee..db124f7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10138,8 +10138,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10138 | if (str2 == String.Empty) | 10138 | if (str2 == String.Empty) |
| 10139 | return str1; | 10139 | return str1; |
| 10140 | 10140 | ||
| 10141 | byte[] data1 = Convert.FromBase64String(str1); | 10141 | byte[] data1; |
| 10142 | byte[] data2 = Convert.FromBase64String(str2); | 10142 | byte[] data2; |
| 10143 | try | ||
| 10144 | { | ||
| 10145 | data1 = Convert.FromBase64String(str1); | ||
| 10146 | data2 = Convert.FromBase64String(str2); | ||
| 10147 | } | ||
| 10148 | catch (Exception) | ||
| 10149 | { | ||
| 10150 | return new LSL_String(String.Empty); | ||
| 10151 | } | ||
| 10143 | 10152 | ||
| 10144 | byte[] d2 = new Byte[data1.Length]; | 10153 | byte[] d2 = new Byte[data1.Length]; |
| 10145 | int pos = 0; | 10154 | int pos = 0; |