Update svn properties, minor formatting cleanup.
parent
68ae63e546
commit
f6699892dc
|
@ -152,7 +152,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
||||||
client.OnLogout += ClientClosed;
|
client.OnLogout += ClientClosed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ClientClosed(IClientAPI client)
|
private void ClientClosed(IClientAPI client)
|
||||||
{
|
{
|
||||||
ClientClosed(client.AgentId);
|
ClientClosed(client.AgentId);
|
||||||
|
@ -168,7 +167,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[EVENTQUEUE]: Avatar {0} entering parcel {1} in region {2}.",
|
m_log.DebugFormat("[EVENTQUEUE]: Avatar {0} entering parcel {1} in region {2}.",
|
||||||
avatar.UUID, localLandID, m_scene.RegionInfo.RegionName);
|
avatar.UUID, localLandID, m_scene.RegionInfo.RegionName);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MakeChildAgent(ScenePresence avatar)
|
private void MakeChildAgent(ScenePresence avatar)
|
||||||
|
@ -200,9 +198,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
||||||
if (!m_ids.ContainsKey(agentID))
|
if (!m_ids.ContainsKey(agentID))
|
||||||
m_ids.Add(agentID, rnd.Next(30000000));
|
m_ids.Add(agentID, rnd.Next(30000000));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Hashtable ProcessQueue(Hashtable request,UUID agentID, Caps caps)
|
public Hashtable ProcessQueue(Hashtable request,UUID agentID, Caps caps)
|
||||||
|
@ -210,7 +205,8 @@ namespace OpenSim.Region.Environment.Modules.Framework
|
||||||
// TODO: this has to be redone to not busy-wait (and block the thread),
|
// TODO: this has to be redone to not busy-wait (and block the thread),
|
||||||
// TODO: as soon as we have a non-blocking way to handle HTTP-requests.
|
// TODO: as soon as we have a non-blocking way to handle HTTP-requests.
|
||||||
|
|
||||||
if(m_log.IsDebugEnabled) {
|
if (m_log.IsDebugEnabled)
|
||||||
|
{
|
||||||
String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ ";
|
String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ ";
|
||||||
foreach (object key in request.Keys)
|
foreach (object key in request.Keys)
|
||||||
{
|
{
|
||||||
|
|
12
prebuild.xml
12
prebuild.xml
|
@ -228,8 +228,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library">
|
<Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -819,7 +817,6 @@
|
||||||
<Reference name="log4net.dll"/>
|
<Reference name="log4net.dll"/>
|
||||||
<Reference name="DotNetOpenMail.dll"/>
|
<Reference name="DotNetOpenMail.dll"/>
|
||||||
|
|
||||||
|
|
||||||
<Files>
|
<Files>
|
||||||
<Match pattern="*.cs" recurse="true">
|
<Match pattern="*.cs" recurse="true">
|
||||||
<Exclude name="Tests" pattern="Tests" />
|
<Exclude name="Tests" pattern="Tests" />
|
||||||
|
@ -1008,7 +1005,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library">
|
<Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -1392,8 +1388,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
|
<Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -1471,7 +1465,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
|
<Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -1578,7 +1571,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library">
|
<Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -2061,7 +2053,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
|
<Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -2198,7 +2189,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.ScriptEngine.Components.DotNetEngine.Commands_LSL" path="OpenSim/ScriptEngine/Components/DotNetEngine/Commands_LSL" type="Library">
|
<Project name="OpenSim.ScriptEngine.Components.DotNetEngine.Commands_LSL" path="OpenSim/ScriptEngine/Components/DotNetEngine/Commands_LSL" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
@ -2445,8 +2435,6 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Tools -->
|
<!-- Tools -->
|
||||||
<Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe">
|
<Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
|
|
Loading…
Reference in New Issue