diff options
author | MW | 2007-06-23 11:14:58 +0000 |
---|---|---|
committer | MW | 2007-06-23 11:14:58 +0000 |
commit | 303ea70efad0ba703743f4a5b9812250c314c2d4 (patch) | |
tree | 47d6a28ef7b026ed0e0fd39619b1bacc6fe3ba55 /OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs | |
parent | Deleted some comments being wrote to console (diff) | |
download | opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.zip opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.gz opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.bz2 opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.xz |
More work on CAPS handler.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs index 00f514a..b8c6c3b 100644 --- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs +++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs | |||
@@ -86,12 +86,12 @@ namespace OpenSim.LocalCommunications | |||
86 | response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + | 86 | response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + |
87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
88 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 88 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
89 | 89 | string capsPath = Util.GetRandomCapsPath(); | |
90 | response.SimAddress = reg.IPListenAddr; | 90 | response.SimAddress = reg.IPListenAddr; |
91 | response.SimPort = (Int32)reg.IPListenPort; | 91 | response.SimPort = (Int32)reg.IPListenPort; |
92 | response.RegionX = reg.RegionLocX ; | 92 | response.RegionX = reg.RegionLocX ; |
93 | response.RegionY = reg.RegionLocY ; | 93 | response.RegionY = reg.RegionLocY ; |
94 | response.SeedCapability = "http://" + reg.IPListenAddr + ":" + "9000" + "/CAPS/00334-0000/"; | 94 | response.SeedCapability = "http://" + reg.IPListenAddr + ":" + "9000" + "/CAPS/"+capsPath +"0000/"; |
95 | theUser.currentAgent.currentRegion = reg.SimUUID; | 95 | theUser.currentAgent.currentRegion = reg.SimUUID; |
96 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 96 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
97 | 97 | ||
@@ -103,6 +103,7 @@ namespace OpenSim.LocalCommunications | |||
103 | _login.Session = response.SessionID; | 103 | _login.Session = response.SessionID; |
104 | _login.SecureSession = response.SecureSessionID; | 104 | _login.SecureSession = response.SecureSessionID; |
105 | _login.CircuitCode = (uint)response.CircuitCode; | 105 | _login.CircuitCode = (uint)response.CircuitCode; |
106 | _login.CapsPath = capsPath; | ||
106 | 107 | ||
107 | m_Parent.InformRegionOfLogin(currentRegion, _login); | 108 | m_Parent.InformRegionOfLogin(currentRegion, _login); |
108 | } | 109 | } |