diff options
author | lbsa71 | 2007-11-29 06:07:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-11-29 06:07:48 +0000 |
commit | a32bb9167597734fa0c977adbadfaaf56cd97c86 (patch) | |
tree | 45987746053dd468104479c936e0bd858b082149 /OpenSim/Region/Environment/Scenes | |
parent | * Locking on local scope variable does not make sense - every thread will hav... (diff) | |
download | opensim-SC-a32bb9167597734fa0c977adbadfaaf56cd97c86.zip opensim-SC-a32bb9167597734fa0c977adbadfaaf56cd97c86.tar.gz opensim-SC-a32bb9167597734fa0c977adbadfaaf56cd97c86.tar.bz2 opensim-SC-a32bb9167597734fa0c977adbadfaaf56cd97c86.tar.xz |
* minor refactorings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3309431..a52e636 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1007,7 +1007,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1007 | 1007 | ||
1008 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) | 1008 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) |
1009 | { | 1009 | { |
1010 | ScenePresence newAvatar = null; | 1010 | ScenePresence avatar = null; |
1011 | 1011 | ||
1012 | byte[] visualParams; | 1012 | byte[] visualParams; |
1013 | AvatarWearable[] wearables; | 1013 | AvatarWearable[] wearables; |
@@ -1018,14 +1018,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1018 | AvatarFactoryModule.GetDefaultAvatarAppearance(out wearables, out visualParams); | 1018 | AvatarFactoryModule.GetDefaultAvatarAppearance(out wearables, out visualParams); |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | newAvatar = m_innerScene.CreateAndAddScenePresence(client, child, wearables, visualParams); | 1021 | avatar = m_innerScene.CreateAndAddScenePresence(client, child, wearables, visualParams); |
1022 | 1022 | ||
1023 | if (newAvatar.IsChildAgent) | 1023 | if (avatar.IsChildAgent) |
1024 | { | 1024 | { |
1025 | newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement; | 1025 | avatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement; |
1026 | } | 1026 | } |
1027 | 1027 | ||
1028 | return newAvatar; | 1028 | return avatar; |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | 1031 | ||
@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1044 | { | 1044 | { |
1045 | client.SendKillObject(avatar.RegionHandle, avatar.LocalId); | 1045 | client.SendKillObject(avatar.RegionHandle, avatar.LocalId); |
1046 | } | 1046 | } |
1047 | catch (System.NullReferenceException NE) | 1047 | catch (System.NullReferenceException) |
1048 | { | 1048 | { |
1049 | //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. | 1049 | //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. |
1050 | 1050 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 45581c5..6a18587 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -496,7 +496,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
496 | /// | 496 | /// |
497 | /// </summary> | 497 | /// </summary> |
498 | /// <returns></returns> | 498 | /// <returns></returns> |
499 | public new SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID) | 499 | public SceneObjectGroup Copy(LLUUID cAgentID, LLUUID cGroupID) |
500 | { | 500 | { |
501 | SceneObjectGroup dupe = (SceneObjectGroup) MemberwiseClone(); | 501 | SceneObjectGroup dupe = (SceneObjectGroup) MemberwiseClone(); |
502 | dupe.m_parts = new Dictionary<LLUUID, SceneObjectPart>(); | 502 | dupe.m_parts = new Dictionary<LLUUID, SceneObjectPart>(); |