aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ViewerSupport
diff options
context:
space:
mode:
authorDiva Canto2014-11-21 08:54:10 -0800
committerDiva Canto2014-11-21 08:54:10 -0800
commit27512f3b421e5e3b8d3d422fa1485d347926a11d (patch)
tree79691d1e57cb0409c1cd83d03f05230f545de491 /OpenSim/Region/OptionalModules/ViewerSupport
parentImproved SpecialUIModule so that it sends the floater data properly. (diff)
downloadopensim-SC_OLD-27512f3b421e5e3b8d3d422fa1485d347926a11d.zip
opensim-SC_OLD-27512f3b421e5e3b8d3d422fa1485d347926a11d.tar.gz
opensim-SC_OLD-27512f3b421e5e3b8d3d422fa1485d347926a11d.tar.bz2
opensim-SC_OLD-27512f3b421e5e3b8d3d422fa1485d347926a11d.tar.xz
Cleanup extraneous comments from viewer support modules
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport')
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs12
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs1
2 files changed, 3 insertions, 10 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)
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
index 51f60bb..3fe922d 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
@@ -146,7 +146,6 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
146 using (StreamReader s = new StreamReader(name)) 146 using (StreamReader s = new StreamReader(name))
147 { 147 {
148 string simple_name = Path.GetFileNameWithoutExtension(name); 148 string simple_name = Path.GetFileNameWithoutExtension(name);
149 m_log.DebugFormat("[XXX]: Reading {0} ({1})", name, simple_name);
150 OSDMap floater = new OSDMap(); 149 OSDMap floater = new OSDMap();
151 floaters[simple_name] = OSDMap.FromString(s.ReadToEnd()); 150 floaters[simple_name] = OSDMap.FromString(s.ReadToEnd());
152 n++; 151 n++;