diff options
author | Jeff Ames | 2008-09-30 05:26:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-30 05:26:57 +0000 |
commit | f6699892dcec49e4b5ff8e4c30a78f8e697f1f94 (patch) | |
tree | 2df60c592be5dca1dc94c7daf0d2bdbb9a50c015 /OpenSim | |
parent | Mantis#2300. Thank you kindly, Idb for a patch that solves: (diff) | |
download | opensim-SC_OLD-f6699892dcec49e4b5ff8e4c30a78f8e697f1f94.zip opensim-SC_OLD-f6699892dcec49e4b5ff8e4c30a78f8e697f1f94.tar.gz opensim-SC_OLD-f6699892dcec49e4b5ff8e4c30a78f8e697f1f94.tar.bz2 opensim-SC_OLD-f6699892dcec49e4b5ff8e4c30a78f8e697f1f94.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 3 insertions, 7 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 | |||
152 | client.OnLogout += ClientClosed; | 152 | client.OnLogout += ClientClosed; |
153 | } | 153 | } |
154 | 154 | ||
155 | |||
156 | private void ClientClosed(IClientAPI client) | 155 | private void ClientClosed(IClientAPI client) |
157 | { | 156 | { |
158 | ClientClosed(client.AgentId); | 157 | ClientClosed(client.AgentId); |
@@ -168,7 +167,6 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
168 | { | 167 | { |
169 | m_log.DebugFormat("[EVENTQUEUE]: Avatar {0} entering parcel {1} in region {2}.", | 168 | m_log.DebugFormat("[EVENTQUEUE]: Avatar {0} entering parcel {1} in region {2}.", |
170 | avatar.UUID, localLandID, m_scene.RegionInfo.RegionName); | 169 | avatar.UUID, localLandID, m_scene.RegionInfo.RegionName); |
171 | |||
172 | } | 170 | } |
173 | 171 | ||
174 | private void MakeChildAgent(ScenePresence avatar) | 172 | private void MakeChildAgent(ScenePresence avatar) |
@@ -200,9 +198,6 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
200 | if (!m_ids.ContainsKey(agentID)) | 198 | if (!m_ids.ContainsKey(agentID)) |
201 | m_ids.Add(agentID, rnd.Next(30000000)); | 199 | m_ids.Add(agentID, rnd.Next(30000000)); |
202 | } | 200 | } |
203 | |||
204 | |||
205 | |||
206 | } | 201 | } |
207 | 202 | ||
208 | public Hashtable ProcessQueue(Hashtable request,UUID agentID, Caps caps) | 203 | public Hashtable ProcessQueue(Hashtable request,UUID agentID, Caps caps) |
@@ -210,7 +205,8 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
210 | // TODO: this has to be redone to not busy-wait (and block the thread), | 205 | // TODO: this has to be redone to not busy-wait (and block the thread), |
211 | // TODO: as soon as we have a non-blocking way to handle HTTP-requests. | 206 | // TODO: as soon as we have a non-blocking way to handle HTTP-requests. |
212 | 207 | ||
213 | if(m_log.IsDebugEnabled) { | 208 | if (m_log.IsDebugEnabled) |
209 | { | ||
214 | String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ "; | 210 | String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ "; |
215 | foreach (object key in request.Keys) | 211 | foreach (object key in request.Keys) |
216 | { | 212 | { |
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 | |||
801 | tokenValue+=JSON[i]; | 801 | tokenValue+=JSON[i]; |
802 | 802 | ||
803 | // handle escaped double quotes \" | 803 | // handle escaped double quotes \" |
804 | if(JSON[i]=='\\' && JSON[i+1]=='"') | 804 | if (JSON[i]=='\\' && JSON[i+1]=='"') |
805 | { | 805 | { |
806 | tokenValue+=JSON[i+1]; | 806 | tokenValue+=JSON[i+1]; |
807 | i++; | 807 | i++; |