diff options
author | Melanie | 2013-07-18 10:08:10 +0100 |
---|---|---|
committer | Melanie | 2013-07-18 10:08:10 +0100 |
commit | 7830cc995471120892a24a39e86283774fa07c4c (patch) | |
tree | d3f46b4f3ce95bb8572511c6f12c9f8ca86922c8 /OpenSim/Tests/Common/Mock/TestClient.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Document obscure Groups config related to the user level required for creatin... (diff) | |
download | opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.zip opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.gz opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.bz2 opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
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 179a91f..6528d9a 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -591,7 +591,7 @@ namespace OpenSim.Tests.Common.Mock | |||
591 | { | 591 | { |
592 | AgentCircuitData agentData = new AgentCircuitData(); | 592 | AgentCircuitData agentData = new AgentCircuitData(); |
593 | agentData.AgentID = AgentId; | 593 | agentData.AgentID = AgentId; |
594 | agentData.SessionID = UUID.Zero; | 594 | agentData.SessionID = SessionId; |
595 | agentData.SecureSessionID = UUID.Zero; | 595 | agentData.SecureSessionID = UUID.Zero; |
596 | agentData.circuitcode = m_circuitCode; | 596 | agentData.circuitcode = m_circuitCode; |
597 | agentData.child = false; | 597 | agentData.child = false; |