aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
index 825c031..2661522 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -102,11 +102,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
102 { 102 {
103 ScenePresence sp = WaitGetScenePresence(agentID); 103 ScenePresence sp = WaitGetScenePresence(agentID);
104 104
105 if (sp == null) // Client is connected but SP still doesn't exist: this may happen on login 105 if (sp != null)
106 {
107 m_log.DebugFormat("[XXX]: SP is null");
108 }
109 else
110 { 106 {
111 // On the receiving region, the call to this cap may arrive before 107 // On the receiving region, the call to this cap may arrive before
112 // the agent is root. Make sure we only proceed from here when the agent 108 // the agent is root. Make sure we only proceed from here when the agent
@@ -122,13 +118,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
122 // The agent must be root and not going anywhere 118 // The agent must be root and not going anywhere
123 if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID)) 119 if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID))
124 rsend.send = true; 120 rsend.send = true;
125 else
126 m_log.DebugFormat("[XXX]: Child or in transit");
127 121
128 } 122 }
129 } 123 }
130 else 124 //else
131 m_log.DebugFormat("[XXX]: client is null"); 125 // m_log.DebugFormat("[XXX]: client is null");
132 126
133 127
134 if (rsendlist == null) 128 if (rsendlist == null)