diff options
author | Teravus Ovares | 2008-04-17 05:07:14 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-17 05:07:14 +0000 |
commit | 244bfcde5b86180981e99ac9e88eb394f20bcd09 (patch) | |
tree | a163db049045c03e475779ce082a3cdfe74aea20 /OpenSim/Region/Communications | |
parent | moved the Thread.Sleep(500), to the correct side of the ar.AsyncWaitHandle.... (diff) | |
download | opensim-SC-244bfcde5b86180981e99ac9e88eb394f20bcd09.zip opensim-SC-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.gz opensim-SC-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.bz2 opensim-SC-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.xz |
* Implements 'Set Home to Here'
* Implements 'Teleport Home'
* User Server has to be updated for it to save your home in grid mode
* home position accuracy is in int because the grid comms ExpectUser method tries to convert to Uint and crashes if it gets a float. Added a convert to decimal in ExpectUser but to avoid a breaking change with old revisions, kept the save value in int for now. Eventually it needs to be a float, but lets release another incremental version before doing that.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 9a7274c..1135ddd 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -579,9 +579,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
579 | { | 579 | { |
580 | m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected"); | 580 | m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected"); |
581 | agentData.startpos = | 581 | agentData.startpos = |
582 | new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), | 582 | new LLVector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), |
583 | Convert.ToUInt32(requestData["startpos_y"]), | 583 | (float)Convert.ToDecimal((string)requestData["startpos_y"]), |
584 | Convert.ToUInt32(requestData["startpos_z"])); | 584 | (float)Convert.ToDecimal((string)requestData["startpos_z"])); |
585 | agentData.child = false; | 585 | agentData.child = false; |
586 | } | 586 | } |
587 | 587 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 5873eb8..c140213 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -314,6 +314,16 @@ namespace OpenSim.Region.Communications.OGS1 | |||
314 | param["AboutText"] = UserProfile.AboutText; | 314 | param["AboutText"] = UserProfile.AboutText; |
315 | param["FLAboutText"] = UserProfile.FirstLifeAboutText; | 315 | param["FLAboutText"] = UserProfile.FirstLifeAboutText; |
316 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); | 316 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); |
317 | |||
318 | param["home_region"] = UserProfile.HomeRegion.ToString(); | ||
319 | |||
320 | param["home_pos_x"] = UserProfile.HomeLocationX.ToString(); | ||
321 | param["home_pos_y"] = UserProfile.HomeLocationY.ToString(); | ||
322 | param["home_pos_z"] = UserProfile.HomeLocationZ.ToString(); | ||
323 | param["home_look_x"] = UserProfile.HomeLookAtX.ToString(); | ||
324 | param["home_look_y"] = UserProfile.HomeLookAtY.ToString(); | ||
325 | param["home_look_z"] = UserProfile.HomeLookAtZ.ToString(); | ||
326 | |||
317 | IList parameters = new ArrayList(); | 327 | IList parameters = new ArrayList(); |
318 | parameters.Add(param); | 328 | parameters.Add(param); |
319 | 329 | ||