aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-05-01 09:11:16 -0700
committerDiva Canto2011-05-01 09:11:16 -0700
commitf0bf64b6debf85440a823816b725dee7d41cedac (patch)
treeba4155810f2b27a8e3220214d92ecd7faa0cc069 /OpenSim
parentAdded OpenSim.Capabilities.Handlers. For the moment it has only the GetTextur... (diff)
parentIncreased Timeout to 30 secs. (diff)
downloadopensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.zip
opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.gz
opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.bz2
opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.xz
Merge branch 'master' into caps
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs12
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
5 files changed, 26 insertions, 10 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index a626b82..28fe3ba 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
462 } 462 }
463 catch (IndexOutOfRangeException e) 463 catch (IndexOutOfRangeException e)
464 { 464 {
465 m_log.WarnFormat("[CHILD AGENT DATA]: scrtips list is shorter than object list."); 465 m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list.");
466 } 466 }
467 467
468 attObjs.Add(info); 468 attObjs.Add(info);
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 9d70f63..ac0828b 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -142,17 +142,17 @@ namespace OpenSim.Framework
142 /// </summary> 142 /// </summary>
143 public static OSDMap PutToService(string url, OSDMap data) 143 public static OSDMap PutToService(string url, OSDMap data)
144 { 144 {
145 return ServiceOSDRequest(url,data,"PUT",10000); 145 return ServiceOSDRequest(url,data,"PUT",30000);
146 } 146 }
147 147
148 public static OSDMap PostToService(string url, OSDMap data) 148 public static OSDMap PostToService(string url, OSDMap data)
149 { 149 {
150 return ServiceOSDRequest(url,data,"POST",10000); 150 return ServiceOSDRequest(url,data,"POST",30000);
151 } 151 }
152 152
153 public static OSDMap GetFromService(string url) 153 public static OSDMap GetFromService(string url)
154 { 154 {
155 return ServiceOSDRequest(url,null,"GET",10000); 155 return ServiceOSDRequest(url,null,"GET",30000);
156 } 156 }
157 157
158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -171,15 +171,15 @@ namespace OpenSim.Framework
171 request.Timeout = timeout; 171 request.Timeout = timeout;
172 request.KeepAlive = false; 172 request.KeepAlive = false;
173 request.MaximumAutomaticRedirections = 10; 173 request.MaximumAutomaticRedirections = 10;
174 request.ReadWriteTimeout = timeout / 4; 174 request.ReadWriteTimeout = timeout * 8;
175 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 175 request.Headers[OSHeaderRequestID] = reqnum.ToString();
176 176
177 // If there is some input, write it into the request 177 // If there is some input, write it into the request
178 if (data != null) 178 if (data != null)
179 { 179 {
180 string strBuffer = OSDParser.SerializeJsonString(data); 180 string strBuffer = OSDParser.SerializeJsonString(data);
181 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); 181 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
182 182
183 request.ContentType = "application/json"; 183 request.ContentType = "application/json";
184 request.ContentLength = buffer.Length; //Count bytes to send 184 request.ContentLength = buffer.Length; //Count bytes to send
185 using (Stream requestStream = request.GetRequestStream()) 185 using (Stream requestStream = request.GetRequestStream())
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 7858f2a..f8cea71 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
179 return true; 179 return true;
180 180
181 // else do the remote thing 181 // else do the remote thing
182 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 182 if (!m_localBackend.IsLocalRegion(destination.RegionID))
183 { 183 {
184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason); 184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
185 } 185 }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
241 return true; 241 return true;
242 242
243 // else do the remote thing 243 // else do the remote thing
244 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 244 if (!m_localBackend.IsLocalRegion(destination.RegionID))
245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason); 245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason);
246 246
247 return false; 247 return false;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2cbe4dc..7c5e246 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2342,6 +2342,22 @@ namespace OpenSim.Region.Framework.Scenes
2342 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); 2342 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2343 newObject.ResumeScripts(); 2343 newObject.ResumeScripts();
2344 } 2344 }
2345 else
2346 {
2347 ScenePresence sp;
2348 if (TryGetScenePresence(newObject.OwnerID, out sp))
2349 {
2350 // If the scene presence is here and already a root
2351 // agent, we came from a ;egacy region. Start the scripts
2352 // here as they used to start.
2353 // TODO: Remove in 0.7.3
2354 if (!sp.IsChildAgent)
2355 {
2356 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2357 newObject.ResumeScripts();
2358 }
2359 }
2360 }
2345 2361
2346 // Do this as late as possible so that listeners have full access to the incoming object 2362 // Do this as late as possible so that listeners have full access to the incoming object
2347 EventManager.TriggerOnIncomingSceneObject(newObject); 2363 EventManager.TriggerOnIncomingSceneObject(newObject);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1aac09d..5b86735 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -937,7 +937,7 @@ namespace OpenSim.Region.Framework.Scenes
937 // and it has already rezzed the attachments and started their scripts. 937 // and it has already rezzed the attachments and started their scripts.
938 // We do the following only for non-login agents, because their scripts 938 // We do the following only for non-login agents, because their scripts
939 // haven't started yet. 939 // haven't started yet.
940 if (wasChild) 940 if (wasChild && Attachments != null && Attachments.Count > 0)
941 { 941 {
942 m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); 942 m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments...");
943 // Resume scripts 943 // Resume scripts