diff options
| author | Melanie | 2009-10-05 10:17:23 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-05 10:17:23 +0100 |
| commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
| tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /OpenSim/Server/Handlers/Simulation | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make the asset connector async Get overload return false if the asset (diff) | |
| download | opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 822edcb..3da72c7 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -161,7 +161,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 161 | 161 | ||
| 162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
| 163 | 163 | ||
| 164 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); | 164 | return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | 167 | ||