aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-12 20:12:03 +0000
committerJustin Clarke Casey2008-09-12 20:12:03 +0000
commit52a4c4d82f9c5b808e6c61fd51c1c70e42865565 (patch)
treef63a4ea443597b2d79ad6c2b7acff058c4437425 /OpenSim/Region/Environment/Scenes
parentremove hidden faces inside prim meshes to improve memory use and startup time (diff)
downloadopensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.zip
opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.gz
opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.bz2
opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.xz
* Check in first part of http://opensimulator.org/mantis/view.php?id=2073
* This patch aims to introduce look at direction persistence between logins. It won't be active until the second part of the patch is committed in about two weeks time. At this point, region servers that haven't upgraded past this revision may run into problems * This checkin upgrades the user database. As always, we recommend you have backups in case something goes wrong. * Many thanks to tyre for this patch.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
2 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 9ff35c0..887a8da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Scenes
579 /// <param name="lookAt"></param> 579 /// <param name="lookAt"></param>
580 /// <param name="flags"></param> 580 /// <param name="flags"></param>
581 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, 581 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
582 Vector3 lookAt, uint flags) 582 Vector3 lookAt, uint teleportFlags)
583 { 583 {
584 bool destRegionUp = false; 584 bool destRegionUp = false;
585 585
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes
604 position.Z = newPosZ; 604 position.Z = newPosZ;
605 } 605 }
606 avatar.ControllingClient.SendTeleportLocationStart(); 606 avatar.ControllingClient.SendTeleportLocationStart();
607 avatar.ControllingClient.SendLocalTeleport(position, lookAt, flags); 607 avatar.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
608 avatar.Teleport(position); 608 avatar.Teleport(position);
609 } 609 }
610 else 610 else
@@ -662,7 +662,7 @@ namespace OpenSim.Region.Environment.Scenes
662 m_log.DebugFormat( 662 m_log.DebugFormat(
663 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); 663 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
664 664
665 avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), 665 avatar.ControllingClient.SendRegionTeleport(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, teleportFlags,
666 capsPath); 666 capsPath);
667 avatar.MakeChildAgent(); 667 avatar.MakeChildAgent();
668 Thread.Sleep(5000); 668 Thread.Sleep(5000);
@@ -716,6 +716,12 @@ namespace OpenSim.Region.Environment.Scenes
716 return m_commsProvider.GridService.GetGridSettings(); 716 return m_commsProvider.GridService.GetGridSettings();
717 } 717 }
718 718
719 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
720 {
721 m_commsProvider.LogOffUser(userid, regionid, regionhandle, position, lookat);
722 }
723
724 // deprecated as of 2008-08-27
719 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) 725 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
720 { 726 {
721 m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); 727 m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1a4b0c9..abda63e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -241,6 +241,11 @@ namespace OpenSim.Region.Environment.Scenes
241 get { return m_CameraCenter; } 241 get { return m_CameraCenter; }
242 } 242 }
243 243
244 public Vector3 Lookat
245 {
246 get { return Util.GetNormalizedVector(new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0)); }
247 }
248
244 private readonly string m_firstname; 249 private readonly string m_firstname;
245 250
246 public string Firstname 251 public string Firstname