From f6699892dcec49e4b5ff8e4c30a78f8e697f1f94 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 30 Sep 2008 05:26:57 +0000
Subject: Update svn properties, minor formatting cleanup.
---
.../Environment/Modules/Framework/EventQueueGetModule.cs | 8 ++------
.../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
prebuild.xml | 12 ------------
3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index d7b99b2..2eb0ecd 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -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)
{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index cd17734..7a9a648 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -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++;
diff --git a/prebuild.xml b/prebuild.xml
index 1533314..6237971 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -228,8 +228,6 @@
-
-
@@ -818,7 +816,6 @@
-
@@ -1008,7 +1005,6 @@
-
@@ -1392,8 +1388,6 @@
-
-
@@ -1471,7 +1465,6 @@
-
@@ -1578,7 +1571,6 @@
-
@@ -2061,7 +2053,6 @@
-
@@ -2198,7 +2189,6 @@
-
@@ -2445,8 +2435,6 @@
-
-
--
cgit v1.1