diff options
| author | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
| commit | eb14e5a1756726b1f296591bb1ac385e4b1372d7 (patch) | |
| tree | 6a7e5e7489785729a2487a0245e0c7e3a9ee99bd /OpenSim/Tests/Common/Mock/TestClient.cs | |
| parent | Add request received/handling stats for caps which are served by http poll ha... (diff) | |
| parent | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt" (diff) | |
| download | opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.zip opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.gz opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.bz2 opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestClient.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index c660501..2fc3f0b 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -584,7 +584,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 584 | { | 584 | { |
| 585 | AgentCircuitData agentData = new AgentCircuitData(); | 585 | AgentCircuitData agentData = new AgentCircuitData(); |
| 586 | agentData.AgentID = AgentId; | 586 | agentData.AgentID = AgentId; |
| 587 | agentData.SessionID = UUID.Zero; | 587 | agentData.SessionID = SessionId; |
| 588 | agentData.SecureSessionID = UUID.Zero; | 588 | agentData.SecureSessionID = UUID.Zero; |
| 589 | agentData.circuitcode = m_circuitCode; | 589 | agentData.circuitcode = m_circuitCode; |
| 590 | agentData.child = false; | 590 | agentData.child = false; |