diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Framework | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 9f2a0ae..60c1ac7 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1075,7 +1075,7 @@ namespace OpenSim.Framework | |||
| 1075 | event SaveStateHandler OnSaveStateEvent; | 1075 | event SaveStateHandler OnSaveStateEvent; |
| 1076 | event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 1076 | event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
| 1077 | event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 1077 | event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
| 1078 | event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 1078 | event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
| 1079 | event FreezeUserUpdate OnParcelFreezeUserEvent; | 1079 | event FreezeUserUpdate OnParcelFreezeUserEvent; |
| 1080 | event EjectUserUpdate OnParcelEjectUserEvent; | 1080 | event EjectUserUpdate OnParcelEjectUserEvent; |
| 1081 | event ParcelBuyPass OnParcelBuyPass; | 1081 | event ParcelBuyPass OnParcelBuyPass; |
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 |