OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup extraneous comments from viewer support modules

mb-throttle-test
Diva Canto 2014-11-21 08:54:10 -08:00
parent 6a8353af36
commit 27512f3b42
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
View File

@ -102,11 +102,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
{ {
ScenePresence sp = WaitGetScenePresence(agentID); ScenePresence sp = WaitGetScenePresence(agentID);
if (sp == null) // Client is connected but SP still doesn't exist: this may happen on login if (sp != null)
{
m_log.DebugFormat("[XXX]: SP is null");
}
else
{ {
// On the receiving region, the call to this cap may arrive before // On the receiving region, the call to this cap may arrive before
// the agent is root. Make sure we only proceed from here when the agent // the agent is root. Make sure we only proceed from here when the agent
@ -122,13 +118,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
// The agent must be root and not going anywhere // The agent must be root and not going anywhere
if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID)) if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID))
rsend.send = true; rsend.send = true;
else
m_log.DebugFormat("[XXX]: Child or in transit");
} }
} }
else //else
m_log.DebugFormat("[XXX]: client is null"); // m_log.DebugFormat("[XXX]: client is null");
if (rsendlist == null) if (rsendlist == null)

1
OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
View File

@ -146,7 +146,6 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
using (StreamReader s = new StreamReader(name)) using (StreamReader s = new StreamReader(name))
{ {
string simple_name = Path.GetFileNameWithoutExtension(name); string simple_name = Path.GetFileNameWithoutExtension(name);
m_log.DebugFormat("[XXX]: Reading {0} ({1})", name, simple_name);
OSDMap floater = new OSDMap(); OSDMap floater = new OSDMap();
floaters[simple_name] = OSDMap.FromString(s.ReadToEnd()); floaters[simple_name] = OSDMap.FromString(s.ReadToEnd());
n++; n++;