aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-10-22 09:04:55 +0000
committerMW2007-10-22 09:04:55 +0000
commit5bf6b245908e15dd3a5a47ec6b2f4602f321ebc5 (patch)
treed430df408304129a81eeb0a8fc43a8669bbdfb33 /OpenSim
parentupdate so that distances aren't required in the config file (diff)
downloadopensim-SC_OLD-5bf6b245908e15dd3a5a47ec6b2f4602f321ebc5.zip
opensim-SC_OLD-5bf6b245908e15dd3a5a47ec6b2f4602f321ebc5.tar.gz
opensim-SC_OLD-5bf6b245908e15dd3a5a47ec6b2f4602f321ebc5.tar.bz2
opensim-SC_OLD-5bf6b245908e15dd3a5a47ec6b2f4602f321ebc5.tar.xz
Bug fix, so that local loginserver (in standalone mode) can set a start position (position inside the region) rather than it always being hardcoded to 128,128. Note: This bug fix is just to allow this to be set. Its not actually used yet (so users will still always start at 128,128).
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Types/Login.cs3
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs13
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs3
3 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Framework/General/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 0a8c0cb..fc1f3ad 100644
--- a/OpenSim/Framework/General/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.cs
@@ -40,10 +40,11 @@ namespace OpenSim.Framework.Types
40 public LLUUID BaseFolder; 40 public LLUUID BaseFolder;
41 public uint CircuitCode; 41 public uint CircuitCode;
42 public string CapsPath =""; 42 public string CapsPath ="";
43 public LLVector3 StartPos;
43 44
44 public Login() 45 public Login()
45 { 46 {
46 47 StartPos = new LLVector3(128, 128, 70);
47 } 48 }
48 } 49 }
49} 50}
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 89213a4..b14bd3d 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Communications.Local
120 public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY) 120 public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
121 { 121 {
122 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 122 List<MapBlockData> mapBlocks = new List<MapBlockData>();
123 foreach(RegionInfo regInfo in this.m_regions.Values) 123 foreach (RegionInfo regInfo in this.m_regions.Values)
124 { 124 {
125 if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY))) 125 if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
126 { 126 {
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Communications.Local
128 map.Name = regInfo.RegionName; 128 map.Name = regInfo.RegionName;
129 map.X = (ushort)regInfo.RegionLocX; 129 map.X = (ushort)regInfo.RegionLocX;
130 map.Y = (ushort)regInfo.RegionLocY; 130 map.Y = (ushort)regInfo.RegionLocY;
131 map.WaterHeight =(byte) regInfo.estateSettings.waterHeight; 131 map.WaterHeight = (byte)regInfo.estateSettings.waterHeight;
132 map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007"); 132 map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
133 map.Agents = 1; 133 map.Agents = 1;
134 map.RegionFlags = 72458694; 134 map.RegionFlags = 72458694;
@@ -200,7 +200,8 @@ namespace OpenSim.Region.Communications.Local
200 agent.circuitcode = loginData.CircuitCode; 200 agent.circuitcode = loginData.CircuitCode;
201 agent.BaseFolder = loginData.BaseFolder; 201 agent.BaseFolder = loginData.BaseFolder;
202 agent.InventoryFolder = loginData.InventoryFolder; 202 agent.InventoryFolder = loginData.InventoryFolder;
203 agent.startpos = new LLVector3(128, 128, 70); 203 agent.startpos = loginData.StartPos;
204
204 agent.CapsPath = loginData.CapsPath; 205 agent.CapsPath = loginData.CapsPath;
205 206
206 TriggerExpectUser(regionHandle, agent); 207 TriggerExpectUser(regionHandle, agent);
@@ -216,7 +217,7 @@ namespace OpenSim.Region.Communications.Local
216 217
217 public void PingCheckReply(Hashtable respData) 218 public void PingCheckReply(Hashtable respData)
218 { 219 {
219 foreach (ulong region in this.m_regions.Keys ) 220 foreach (ulong region in this.m_regions.Keys)
220 { 221 {
221 Hashtable regData = new Hashtable(); 222 Hashtable regData = new Hashtable();
222 RegionInfo reg = m_regions[region]; 223 RegionInfo reg = m_regions[region];
@@ -229,7 +230,7 @@ namespace OpenSim.Region.Communications.Local
229 230
230 public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 231 public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
231 { 232 {
232 if ( m_regionListeners.ContainsKey(regionHandle)) 233 if (m_regionListeners.ContainsKey(regionHandle))
233 { 234 {
234 return m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position, 235 return m_regionListeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position,
235 isFlying); 236 isFlying);
@@ -250,7 +251,7 @@ namespace OpenSim.Region.Communications.Local
250 } 251 }
251 252
252 253
253 254
254 } 255 }
255} 256}
256 257
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 9c10d04..37461c0 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -137,7 +137,8 @@ namespace OpenSim.Region.Communications.Local
137 _login.Agent = response.AgentID; 137 _login.Agent = response.AgentID;
138 _login.Session = response.SessionID; 138 _login.Session = response.SessionID;
139 _login.SecureSession = response.SecureSessionID; 139 _login.SecureSession = response.SecureSessionID;
140 _login.CircuitCode = (uint)response.CircuitCode; 140 _login.CircuitCode = (uint)response.CircuitCode;
141 _login.StartPos = new LLVector3(128, 128, 70);
141 _login.CapsPath = capsPath; 142 _login.CapsPath = capsPath;
142 143
143 if( OnLoginToRegion != null ) 144 if( OnLoginToRegion != null )