aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs13
2 files changed, 13 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 58bc9ce..2e47e07 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -50,6 +50,7 @@ Patches
50* Diva Canto 50* Diva Canto
51* krtaylor (IBM) 51* krtaylor (IBM)
52* A_Biondi 52* A_Biondi
53* lulurun
53 54
54 55
55LSL Devs 56LSL Devs
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f6bd974..d409951 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -78,6 +78,9 @@ namespace OpenSim.Grid.UserServer
78 try 78 try
79 { 79 {
80 RegionProfileData SimInfo = null; 80 RegionProfileData SimInfo = null;
81 int start_x = -1;
82 int start_y = -1;
83 int start_z = -1;
81 if (startLocationRequest == "last") 84 if (startLocationRequest == "last")
82 { 85 {
83 SimInfo = 86 SimInfo =
@@ -119,6 +122,10 @@ namespace OpenSim.Grid.UserServer
119 RegionProfileData.RequestSimProfileData( 122 RegionProfileData.RequestSimProfileData(
120 theUser.homeRegion, m_config.GridServerURL, 123 theUser.homeRegion, m_config.GridServerURL,
121 m_config.GridSendKey, m_config.GridRecvKey); 124 m_config.GridSendKey, m_config.GridRecvKey);
125 } else {
126 start_x = Convert.ToInt32(startLocationRequestParsed[1]);
127 start_y = Convert.ToInt32(startLocationRequestParsed[2]);
128 start_z = Convert.ToInt32(startLocationRequestParsed[3]);
122 } 129 }
123 } 130 }
124 } 131 }
@@ -159,7 +166,11 @@ namespace OpenSim.Grid.UserServer
159 166
160 theUser.currentAgent.currentRegion = SimInfo.UUID; 167 theUser.currentAgent.currentRegion = SimInfo.UUID;
161 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 168 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
162 169 if (start_x >= 0 && start_y >= 0 && start_z >= 0) {
170 theUser.currentAgent.currentPos.X = start_x;
171 theUser.currentAgent.currentPos.Y = start_y;
172 theUser.currentAgent.currentPos.Z = start_z;
173 }
163 // Prepare notification 174 // Prepare notification
164 Hashtable SimParams = new Hashtable(); 175 Hashtable SimParams = new Hashtable();
165 SimParams["session_id"] = theUser.currentAgent.sessionID.ToString(); 176 SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();