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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-09-30 05:26:57 +00:00
parent 68ae63e546
commit f6699892dc
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
View File

@ -152,7 +152,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
client.OnLogout += ClientClosed;
}
private void ClientClosed(IClientAPI client)
{
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}.",
avatar.UUID, localLandID, m_scene.RegionInfo.RegionName);
}
private void MakeChildAgent(ScenePresence avatar)
@ -200,9 +198,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
if (!m_ids.ContainsKey(agentID))
m_ids.Add(agentID, rnd.Next(30000000));
}
}
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: 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}: [ ";
foreach (object key in request.Keys)
{

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -801,7 +801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
tokenValue+=JSON[i];
// handle escaped double quotes \"
if(JSON[i]=='\\' && JSON[i+1]=='"')
if (JSON[i]=='\\' && JSON[i+1]=='"')
{
tokenValue+=JSON[i+1];
i++;

12
prebuild.xml
View File

@ -228,8 +228,6 @@
</Files>
</Project>
<Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library">
<Configuration name="Debug">
<Options>
@ -818,7 +816,6 @@
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
<Reference name="DotNetOpenMail.dll"/>
<Files>
<Match pattern="*.cs" recurse="true">
@ -1008,7 +1005,6 @@
</Files>
</Project>
<Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library">
<Configuration name="Debug">
<Options>
@ -1392,8 +1388,6 @@
</Files>
</Project>
<Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
<Configuration name="Debug">
<Options>
@ -1471,7 +1465,6 @@
</Files>
</Project>
<Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
<Configuration name="Debug">
<Options>
@ -1578,7 +1571,6 @@
</Files>
</Project>
<Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library">
<Configuration name="Debug">
<Options>
@ -2061,7 +2053,6 @@
</Files>
</Project>
<Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
<Configuration name="Debug">
<Options>
@ -2198,7 +2189,6 @@
</Files>
</Project>
<Project name="OpenSim.ScriptEngine.Components.DotNetEngine.Commands_LSL" path="OpenSim/ScriptEngine/Components/DotNetEngine/Commands_LSL" type="Library">
<Configuration name="Debug">
<Options>
@ -2445,8 +2435,6 @@
</Files>
</Project>
<!-- Tools -->
<Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe">
<Configuration name="Debug">