diff options
| author | Melanie | 2013-02-07 20:51:51 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 20:51:51 +0000 |
| commit | 45f5a6a6db16538d864ff90ab6952aea13007514 (patch) | |
| tree | 48583f7c77afd88a4760ea9db9159741f659fe5b /OpenSim/Framework/Servers/Tests | |
| parent | Rename Bounciness to Restitution (diff) | |
| parent | Change passed PhysicsParameter value from float to the more general string value (diff) | |
| download | opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.zip opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.gz opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.bz2 opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
bin/HttpServer_OpenSim.dll
Diffstat (limited to 'OpenSim/Framework/Servers/Tests')
| -rw-r--r-- | OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs index 50f306e..deae45c 100644 --- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs +++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs | |||
| @@ -70,6 +70,11 @@ namespace OpenSim.Framework.Servers.Tests | |||
| 70 | public void Close() { } | 70 | public void Close() { } |
| 71 | public bool EndWhenDone { get { return false;} set { return;}} | 71 | public bool EndWhenDone { get { return false;} set { return;}} |
| 72 | 72 | ||
| 73 | public HTTPNetworkContext GiveMeTheNetworkStreamIKnowWhatImDoing() | ||
| 74 | { | ||
| 75 | return new HTTPNetworkContext(); | ||
| 76 | } | ||
| 77 | |||
| 73 | public event EventHandler<DisconnectedEventArgs> Disconnected = delegate { }; | 78 | public event EventHandler<DisconnectedEventArgs> Disconnected = delegate { }; |
| 74 | /// <summary> | 79 | /// <summary> |
| 75 | /// A request have been received in the context. | 80 | /// A request have been received in the context. |