diff options
| author | Melanie | 2010-01-03 21:43:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 21:43:39 +0000 |
| commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
| tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Framework/Servers | |
| parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
| parent | Cause llSetText to send prim updates. (diff) | |
| download | opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 857c584..214f936 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -741,7 +741,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 741 | xmlRpcResponse = new XmlRpcResponse(); | 741 | xmlRpcResponse = new XmlRpcResponse(); |
| 742 | 742 | ||
| 743 | // Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php | 743 | // Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php |
| 744 | xmlRpcResponse.SetFault(-32603, errorMessage); | 744 | xmlRpcResponse.SetFault(-32603, errorMessage); |
| 745 | } | 745 | } |
| 746 | 746 | ||
| 747 | // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here | 747 | // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here |