diff options
author | Melanie | 2012-02-01 10:05:04 +0000 |
---|---|---|
committer | Melanie | 2012-02-01 10:05:04 +0000 |
commit | 003bd9f1b3a774141d53282d3b3c13a7e121f0a4 (patch) | |
tree | e5051400b012714f783911959752dcdbd2fdd393 /OpenSim/Region | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-003bd9f1b3a774141d53282d3b3c13a7e121f0a4.zip opensim-SC-003bd9f1b3a774141d53282d3b3c13a7e121f0a4.tar.gz opensim-SC-003bd9f1b3a774141d53282d3b3c13a7e121f0a4.tar.bz2 opensim-SC-003bd9f1b3a774141d53282d3b3c13a7e121f0a4.tar.xz |
Small optimization to last commit
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2af4a1c..23fee4e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3056,11 +3056,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3056 | public override void RemoveClient(UUID agentID, bool closeChildAgents) | 3056 | public override void RemoveClient(UUID agentID, bool closeChildAgents) |
3057 | { | 3057 | { |
3058 | CheckHeartbeat(); | 3058 | CheckHeartbeat(); |
3059 | bool childagentYN = false; | 3059 | bool isChildAgent = false; |
3060 | ScenePresence avatar = GetScenePresence(agentID); | 3060 | ScenePresence avatar = GetScenePresence(agentID); |
3061 | if (avatar != null) | 3061 | if (avatar != null) |
3062 | { | 3062 | { |
3063 | childagentYN = avatar.IsChildAgent; | 3063 | isChildAgent = avatar.IsChildAgent; |
3064 | 3064 | ||
3065 | if (avatar.ParentID != 0) | 3065 | if (avatar.ParentID != 0) |
3066 | { | 3066 | { |
@@ -3071,9 +3071,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3071 | { | 3071 | { |
3072 | m_log.DebugFormat( | 3072 | m_log.DebugFormat( |
3073 | "[SCENE]: Removing {0} agent {1} from region {2}", | 3073 | "[SCENE]: Removing {0} agent {1} from region {2}", |
3074 | (childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName); | 3074 | (isChildAgent ? "child" : "root"), agentID, RegionInfo.RegionName); |
3075 | 3075 | ||
3076 | m_sceneGraph.removeUserCount(!childagentYN); | 3076 | m_sceneGraph.removeUserCount(!isChildAgent); |
3077 | 3077 | ||
3078 | // TODO: We shouldn't use closeChildAgents here - it's being used by the NPC module to stop | 3078 | // TODO: We shouldn't use closeChildAgents here - it's being used by the NPC module to stop |
3079 | // unnecessary operations. This should go away once NPCs have no accompanying IClientAPI | 3079 | // unnecessary operations. This should go away once NPCs have no accompanying IClientAPI |
@@ -3103,7 +3103,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3103 | { | 3103 | { |
3104 | m_eventManager.TriggerOnRemovePresence(agentID); | 3104 | m_eventManager.TriggerOnRemovePresence(agentID); |
3105 | 3105 | ||
3106 | if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) | 3106 | if (AttachmentsModule != null && !isChildAgent && avatar.PresenceType != PresenceType.Npc) |
3107 | { | 3107 | { |
3108 | IUserManagement uMan = RequestModuleInterface<IUserManagement>(); | 3108 | IUserManagement uMan = RequestModuleInterface<IUserManagement>(); |
3109 | // Don't save attachments for HG visitors, it | 3109 | // Don't save attachments for HG visitors, it |