diff options
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 | ||||
-rw-r--r-- | 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 | |||
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++; |
diff --git a/prebuild.xml b/prebuild.xml index 1533314..6237971 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -228,8 +228,6 @@ | |||
228 | </Files> | 228 | </Files> |
229 | </Project> | 229 | </Project> |
230 | 230 | ||
231 | |||
232 | |||
233 | <Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library"> | 231 | <Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library"> |
234 | <Configuration name="Debug"> | 232 | <Configuration name="Debug"> |
235 | <Options> | 233 | <Options> |
@@ -818,7 +816,6 @@ | |||
818 | <Reference name="Nini.dll" /> | 816 | <Reference name="Nini.dll" /> |
819 | <Reference name="log4net.dll"/> | 817 | <Reference name="log4net.dll"/> |
820 | <Reference name="DotNetOpenMail.dll"/> | 818 | <Reference name="DotNetOpenMail.dll"/> |
821 | |||
822 | 819 | ||
823 | <Files> | 820 | <Files> |
824 | <Match pattern="*.cs" recurse="true"> | 821 | <Match pattern="*.cs" recurse="true"> |
@@ -1008,7 +1005,6 @@ | |||
1008 | </Files> | 1005 | </Files> |
1009 | </Project> | 1006 | </Project> |
1010 | 1007 | ||
1011 | |||
1012 | <Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library"> | 1008 | <Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library"> |
1013 | <Configuration name="Debug"> | 1009 | <Configuration name="Debug"> |
1014 | <Options> | 1010 | <Options> |
@@ -1392,8 +1388,6 @@ | |||
1392 | </Files> | 1388 | </Files> |
1393 | </Project> | 1389 | </Project> |
1394 | 1390 | ||
1395 | |||
1396 | |||
1397 | <Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> | 1391 | <Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> |
1398 | <Configuration name="Debug"> | 1392 | <Configuration name="Debug"> |
1399 | <Options> | 1393 | <Options> |
@@ -1471,7 +1465,6 @@ | |||
1471 | </Files> | 1465 | </Files> |
1472 | </Project> | 1466 | </Project> |
1473 | 1467 | ||
1474 | |||
1475 | <Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library"> | 1468 | <Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library"> |
1476 | <Configuration name="Debug"> | 1469 | <Configuration name="Debug"> |
1477 | <Options> | 1470 | <Options> |
@@ -1578,7 +1571,6 @@ | |||
1578 | </Files> | 1571 | </Files> |
1579 | </Project> | 1572 | </Project> |
1580 | 1573 | ||
1581 | |||
1582 | <Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library"> | 1574 | <Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library"> |
1583 | <Configuration name="Debug"> | 1575 | <Configuration name="Debug"> |
1584 | <Options> | 1576 | <Options> |
@@ -2061,7 +2053,6 @@ | |||
2061 | </Files> | 2053 | </Files> |
2062 | </Project> | 2054 | </Project> |
2063 | 2055 | ||
2064 | |||
2065 | <Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> | 2056 | <Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> |
2066 | <Configuration name="Debug"> | 2057 | <Configuration name="Debug"> |
2067 | <Options> | 2058 | <Options> |
@@ -2198,7 +2189,6 @@ | |||
2198 | </Files> | 2189 | </Files> |
2199 | </Project> | 2190 | </Project> |
2200 | 2191 | ||
2201 | |||
2202 | <Project name="OpenSim.ScriptEngine.Components.DotNetEngine.Commands_LSL" path="OpenSim/ScriptEngine/Components/DotNetEngine/Commands_LSL" type="Library"> | 2192 | <Project name="OpenSim.ScriptEngine.Components.DotNetEngine.Commands_LSL" path="OpenSim/ScriptEngine/Components/DotNetEngine/Commands_LSL" type="Library"> |
2203 | <Configuration name="Debug"> | 2193 | <Configuration name="Debug"> |
2204 | <Options> | 2194 | <Options> |
@@ -2445,8 +2435,6 @@ | |||
2445 | </Files> | 2435 | </Files> |
2446 | </Project> | 2436 | </Project> |
2447 | 2437 | ||
2448 | |||
2449 | |||
2450 | <!-- Tools --> | 2438 | <!-- Tools --> |
2451 | <Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe"> | 2439 | <Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe"> |
2452 | <Configuration name="Debug"> | 2440 | <Configuration name="Debug"> |