diff options
author | MW | 2007-05-17 14:37:57 +0000 |
---|---|---|
committer | MW | 2007-05-17 14:37:57 +0000 |
commit | 915b8962a37b2dd0e5e75540862f5347c820b2dc (patch) | |
tree | 84040b06ec9a4273305234dcb1b21f2db36f8bf2 /OpenSim.RegionServer/SimClient.cs | |
parent | * minor rearrangement for clarity (diff) | |
download | opensim-SC-915b8962a37b2dd0e5e75540862f5347c820b2dc.zip opensim-SC-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.gz opensim-SC-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.bz2 opensim-SC-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.xz |
Hopefully everything is working again
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index ab20846..daaa6dd 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -116,15 +116,15 @@ namespace OpenSim | |||
116 | cirpack = initialcirpack; | 116 | cirpack = initialcirpack; |
117 | userEP = remoteEP; | 117 | userEP = remoteEP; |
118 | 118 | ||
119 | //currently not working due to changes in progress to the authenticating system. | 119 | if (m_gridServer.GetName() == "Remote") |
120 | /* if (m_gridServer.GetName() == "Remote") | ||
121 | { | 120 | { |
122 | this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); | 121 | this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); |
123 | } | 122 | } |
124 | else | 123 | else |
125 | {*/ | 124 | { |
126 | this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f); | 125 | this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f); |
127 | // } | 126 | } |
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); |