diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/ConsoleClient/Requester.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/ConsoleClient/Requester.cs')
| -rw-r--r-- | OpenSim/ConsoleClient/Requester.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ConsoleClient/Requester.cs b/OpenSim/ConsoleClient/Requester.cs index fefe969..aabb02c 100644 --- a/OpenSim/ConsoleClient/Requester.cs +++ b/OpenSim/ConsoleClient/Requester.cs | |||
| @@ -50,7 +50,7 @@ namespace OpenSim.ConsoleClient | |||
| 50 | 50 | ||
| 51 | request.ContentType = "application/x-www-form-urlencoded"; | 51 | request.ContentType = "application/x-www-form-urlencoded"; |
| 52 | 52 | ||
| 53 | byte[] buffer = new System.Text.ASCIIEncoding().GetBytes(data); | 53 | byte[] buffer = Encoding.ASCII.GetBytes(data); |
| 54 | int length = (int) buffer.Length; | 54 | int length = (int) buffer.Length; |
| 55 | request.ContentLength = length; | 55 | request.ContentLength = length; |
| 56 | 56 | ||