aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
diff options
context:
space:
mode:
authorDiva Canto2014-11-11 20:42:13 -0800
committerDiva Canto2014-11-11 20:42:13 -0800
commit32293cfd6ba20cc5cab0a5acba587edea2582324 (patch)
treef22e6593deb43629b0c89cbeb941c90f8517be79 /OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-32293cfd6ba20cc5cab0a5acba587edea2582324.zip
opensim-SC-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.gz
opensim-SC-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.bz2
opensim-SC-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.xz
Fix the fetching of module references in the viewer support modules.
Remove the detachment of attachments in camera-only, because it doesn't work for HG people, and it's too drastic of a move.
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs')
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
index 1900f31..825c031 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -101,6 +101,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
101 if (client != null) 101 if (client != null)
102 { 102 {
103 ScenePresence sp = WaitGetScenePresence(agentID); 103 ScenePresence sp = WaitGetScenePresence(agentID);
104
104 if (sp == null) // Client is connected but SP still doesn't exist: this may happen on login 105 if (sp == null) // Client is connected but SP still doesn't exist: this may happen on login
105 { 106 {
106 m_log.DebugFormat("[XXX]: SP is null"); 107 m_log.DebugFormat("[XXX]: SP is null");
@@ -123,11 +124,13 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
123 rsend.send = true; 124 rsend.send = true;
124 else 125 else
125 m_log.DebugFormat("[XXX]: Child or in transit"); 126 m_log.DebugFormat("[XXX]: Child or in transit");
127
126 } 128 }
127 } 129 }
128 else 130 else
129 m_log.DebugFormat("[XXX]: client is null"); 131 m_log.DebugFormat("[XXX]: client is null");
130 132
133
131 if (rsendlist == null) 134 if (rsendlist == null)
132 { 135 {
133 rsendlist = new List<RegionSend>(); 136 rsendlist = new List<RegionSend>();