diff options
| author | Melanie | 2013-05-04 01:22:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-04 01:22:12 +0100 |
| commit | 3aa83738e2a845d05bb25ab81634d0540971c0bf (patch) | |
| tree | 411d946b817b020c72f3d9a35926215e28bf2d95 /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2 opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index de8539f..6eb25ef 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
| @@ -621,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
| 621 | { | 621 | { |
| 622 | if (!WorkItem.Cancel()) | 622 | if (!WorkItem.Cancel()) |
| 623 | { | 623 | { |
| 624 | WorkItem.Abort(); | 624 | WorkItem.Cancel(true); |
| 625 | } | 625 | } |
| 626 | } | 626 | } |
| 627 | catch (Exception) | 627 | catch (Exception) |