diff options
author | MW | 2007-05-17 13:39:30 +0000 |
---|---|---|
committer | MW | 2007-05-17 13:39:30 +0000 |
commit | 60ceda3cfc0527e72089b748c414a027979c358d (patch) | |
tree | ac72ea0e227d5e4be3d21d5ecb428a96ca80564e /OpenSim.RegionServer | |
parent | Attempt to fix trunk which someone broke <looks innocent> (diff) | |
download | opensim-SC-60ceda3cfc0527e72089b748c414a027979c358d.zip opensim-SC-60ceda3cfc0527e72089b748c414a027979c358d.tar.gz opensim-SC-60ceda3cfc0527e72089b748c414a027979c358d.tar.bz2 opensim-SC-60ceda3cfc0527e72089b748c414a027979c358d.tar.xz |
Attempt 2
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/SimClient.Grid.cs | 22 | ||||
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 4 |
2 files changed, 8 insertions, 18 deletions
diff --git a/OpenSim.RegionServer/SimClient.Grid.cs b/OpenSim.RegionServer/SimClient.Grid.cs index 6aefa6f..2f3be0e 100644 --- a/OpenSim.RegionServer/SimClient.Grid.cs +++ b/OpenSim.RegionServer/SimClient.Grid.cs | |||
@@ -33,12 +33,6 @@ namespace OpenSim | |||
33 | 33 | ||
34 | RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer; | 34 | RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer; |
35 | 35 | ||
36 | Dictionary<uint, AgentCircuitData> agentCircuits = this.m_authenticateSessionsHandler.AgentCircuits; | ||
37 | AgentCircuitData agentCircuit; | ||
38 | |||
39 | if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit)) | ||
40 | { | ||
41 | |||
42 | foreach (Hashtable neighbour in gridServer.neighbours) | 36 | foreach (Hashtable neighbour in gridServer.neighbours) |
43 | { | 37 | { |
44 | string neighbourIPStr = (string)neighbour["sim_ip"]; | 38 | string neighbourIPStr = (string)neighbour["sim_ip"]; |
@@ -49,11 +43,11 @@ namespace OpenSim | |||
49 | Console.WriteLine(reqUrl); | 43 | Console.WriteLine(reqUrl); |
50 | 44 | ||
51 | SimParams = new Hashtable(); | 45 | SimParams = new Hashtable(); |
52 | SimParams["session_id"] = agentCircuit.SessionID.ToString(); | 46 | SimParams["session_id"] = this.SessionID.ToString(); |
53 | SimParams["secure_session_id"] = agentCircuit.SecureSessionID.ToString(); | 47 | SimParams["secure_session_id"] = this.SecureSessionID.ToString(); |
54 | SimParams["firstname"] = agentCircuit.firstname; | 48 | SimParams["firstname"] = this.ClientAvatar.firstname; |
55 | SimParams["lastname"] = agentCircuit.lastname; | 49 | SimParams["lastname"] = this.ClientAvatar.lastname; |
56 | SimParams["agent_id"] = agentCircuit.AgentID.ToString(); | 50 | SimParams["agent_id"] = this.AgentID; |
57 | SimParams["circuit_code"] = (Int32)this.CircuitCode; | 51 | SimParams["circuit_code"] = (Int32)this.CircuitCode; |
58 | SimParams["child_agent"] = "1"; | 52 | SimParams["child_agent"] = "1"; |
59 | SendParams = new ArrayList(); | 53 | SendParams = new ArrayList(); |
@@ -80,11 +74,7 @@ namespace OpenSim | |||
80 | this.OutPacket(enable); | 74 | this.OutPacket(enable); |
81 | } | 75 | } |
82 | enablePackets.Clear(); | 76 | enablePackets.Clear(); |
83 | } | 77 | |
84 | else | ||
85 | { | ||
86 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "SimClient.cs: Couldn't find AgentCircuit for CircuitCode {0}.", CircuitCode); | ||
87 | } | ||
88 | } | 78 | } |
89 | } | 79 | } |
90 | 80 | ||
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 980e1d8..ab20846 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -119,12 +119,12 @@ namespace OpenSim | |||
119 | //currently not working due to changes in progress to the authenticating system. | 119 | //currently not working due to changes in progress to the authenticating system. |
120 | /* if (m_gridServer.GetName() == "Remote") | 120 | /* if (m_gridServer.GetName() == "Remote") |
121 | { | 121 | { |
122 | this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos; | 122 | this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); |
123 | } | 123 | } |
124 | else | 124 | else |
125 | {*/ | 125 | {*/ |
126 | this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f); | 126 | this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f); |
127 | //} | 127 | // } |
128 | PacketQueue = new BlockingQueue<QueItem>(); | 128 | PacketQueue = new BlockingQueue<QueItem>(); |
129 | 129 | ||
130 | this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); | 130 | this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); |