diff options
* Started renaming world to Scene
* Update and UpdateMovement now first stores array to avoid collection update exceptions
* Ignored some bins
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index e81ac7b..b3255c4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
120 | public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo) | 120 | public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo) |
121 | { | 121 | { |
122 | 122 | ||
123 | m_world = world; | 123 | m_scene = world; |
124 | this.m_uuid = theClient.AgentId; | 124 | this.m_uuid = theClient.AgentId; |
125 | 125 | ||
126 | m_regionInfo = reginfo; | 126 | m_regionInfo = reginfo; |
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
129 | ControllingClient = theClient; | 129 | ControllingClient = theClient; |
130 | this.firstname = ControllingClient.FirstName; | 130 | this.firstname = ControllingClient.FirstName; |
131 | this.lastname = ControllingClient.LastName; | 131 | this.lastname = ControllingClient.LastName; |
132 | m_localId = m_world.NextLocalId; | 132 | m_localId = m_scene.NextLocalId; |
133 | Pos = ControllingClient.StartPos; | 133 | Pos = ControllingClient.StartPos; |
134 | visualParams = new byte[218]; | 134 | visualParams = new byte[218]; |
135 | for (int i = 0; i < 218; i++) | 135 | for (int i = 0; i < 218; i++) |
@@ -394,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
394 | /// </summary> | 394 | /// </summary> |
395 | public void SendTerseUpdateToALLClients() | 395 | public void SendTerseUpdateToALLClients() |
396 | { | 396 | { |
397 | List<ScenePresence> avatars = this.m_world.RequestAvatarList(); | 397 | List<ScenePresence> avatars = this.m_scene.RequestAvatarList(); |
398 | for (int i = 0; i < avatars.Count; i++) | 398 | for (int i = 0; i < avatars.Count; i++) |
399 | { | 399 | { |
400 | this.SendTerseUpdateToClient(avatars[i].ControllingClient); | 400 | this.SendTerseUpdateToClient(avatars[i].ControllingClient); |
@@ -412,8 +412,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
412 | 412 | ||
413 | public void SendFullUpdateToALLClients() | 413 | public void SendFullUpdateToALLClients() |
414 | { | 414 | { |
415 | List<ScenePresence> avatars = this.m_world.RequestAvatarList(); | 415 | List<ScenePresence> avatars = this.m_scene.RequestAvatarList(); |
416 | foreach (ScenePresence avatar in this.m_world.RequestAvatarList()) | 416 | foreach (ScenePresence avatar in this.m_scene.RequestAvatarList()) |
417 | { | 417 | { |
418 | this.SendFullUpdateToOtherClient(avatar); | 418 | this.SendFullUpdateToOtherClient(avatar); |
419 | avatar.SendFullUpdateToOtherClient(this); | 419 | avatar.SendFullUpdateToOtherClient(this); |
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
428 | this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.m_uuid, this.LocalId, this.Pos, DefaultTexture); | 428 | this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.m_uuid, this.LocalId, this.Pos, DefaultTexture); |
429 | if (this.newAvatar) | 429 | if (this.newAvatar) |
430 | { | 430 | { |
431 | this.m_world.InformClientOfNeighbours(this.ControllingClient); | 431 | this.m_scene.InformClientOfNeighbours(this.ControllingClient); |
432 | this.newAvatar = false; | 432 | this.newAvatar = false; |
433 | } | 433 | } |
434 | } | 434 | } |
@@ -441,7 +441,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
441 | { | 441 | { |
442 | this.ControllingClient.SendWearables(this.Wearables); | 442 | this.ControllingClient.SendWearables(this.Wearables); |
443 | this.SendFullUpdateToALLClients(); | 443 | this.SendFullUpdateToALLClients(); |
444 | this.m_world.SendAllSceneObjectsToClient(this.ControllingClient); | 444 | this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient); |
445 | } | 445 | } |
446 | 446 | ||
447 | /// <summary> | 447 | /// <summary> |
@@ -462,7 +462,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
462 | { | 462 | { |
463 | this.current_anim = animID; | 463 | this.current_anim = animID; |
464 | this.anim_seq = seq; | 464 | this.anim_seq = seq; |
465 | List<ScenePresence> avatars = this.m_world.RequestAvatarList(); | 465 | List<ScenePresence> avatars = this.m_scene.RequestAvatarList(); |
466 | for (int i = 0; i < avatars.Count; i++) | 466 | for (int i = 0; i < avatars.Count; i++) |
467 | { | 467 | { |
468 | avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId); | 468 | avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId); |
@@ -550,10 +550,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
550 | 550 | ||
551 | LLVector3 vel = this.m_velocity; | 551 | LLVector3 vel = this.m_velocity; |
552 | ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256)); | 552 | ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256)); |
553 | RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle); | 553 | RegionInfo neighbourRegion = this.m_scene.RequestNeighbouringRegionInfo(neighbourHandle); |
554 | if (neighbourRegion != null) | 554 | if (neighbourRegion != null) |
555 | { | 555 | { |
556 | bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); | 556 | bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); |
557 | if (res) | 557 | if (res) |
558 | { | 558 | { |
559 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); | 559 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); |
@@ -574,7 +574,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
574 | /// <summary> | 574 | /// <summary> |
575 | /// | 575 | /// |
576 | /// </summary> | 576 | /// </summary> |
577 | public override void updateMovement() | 577 | public override void UpdateMovement() |
578 | { | 578 | { |
579 | newForce = false; | 579 | newForce = false; |
580 | lock (this.forcesList) | 580 | lock (this.forcesList) |