Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
author: lcc 2010-04-10 23:52:10 +0200
committer: lcc 2010-04-10 23:52:10 +0200
commit: 7ecd9b3f1ac4556125a35ab384224b2ca0401a11 (patch)
tree: 63151eb7e3693485af9db8947f2004f586062ca5 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parent: Adding ColdStart event (diff)
parent: guarantee that a script engine's GetScriptErrors() will not be called (diff)
download: opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.zip
opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.gz
opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.bz2
opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 5f84252..04626d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.Framework.Scenes
        public bool WaitForCallback(UUID id)
        {
-            int count = 200;
+            int count = 400;
            while (m_agentsInTransit.Contains(id) && count-- > 0)
            {
                //m_log.Debug("  >>> Waiting... " + count);
author	lcc	2010-04-10 23:52:10 +0200
committer	lcc	2010-04-10 23:52:10 +0200
commit	7ecd9b3f1ac4556125a35ab384224b2ca0401a11 (patch)
tree	63151eb7e3693485af9db8947f2004f586062ca5 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parent	Adding ColdStart event (diff)
parent	guarantee that a script engine's GetScriptErrors() will not be called (diff)
download	opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.zip opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.gz opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.bz2 opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 5f84252..04626d3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.Framework.Scenes
1032		1032
1033	public bool WaitForCallback(UUID id)	1033	public bool WaitForCallback(UUID id)
1034	{	1034	{
1035	int count = 200;	1035	int count = 400;
1036	while (m_agentsInTransit.Contains(id) && count-- > 0)	1036	while (m_agentsInTransit.Contains(id) && count-- > 0)
1037	{	1037	{
1038	//m_log.Debug(" >>> Waiting... " + count);	1038	//m_log.Debug(" >>> Waiting... " + count);