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/SimClient.cs | |
| 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.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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); |