aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorTleiades Hax2007-10-18 15:10:43 +0000
committerTleiades Hax2007-10-18 15:10:43 +0000
commit05df8571323c535b5c1ce1b0532e88236b143b7e (patch)
tree6f275d5b682231906315363514e98b7b06557fda /OpenSim/Grid
parent* Removed some comments (diff)
downloadopensim-SC_OLD-05df8571323c535b5c1ce1b0532e88236b143b7e.zip
opensim-SC_OLD-05df8571323c535b5c1ce1b0532e88236b143b7e.tar.gz
opensim-SC_OLD-05df8571323c535b5c1ce1b0532e88236b143b7e.tar.bz2
opensim-SC_OLD-05df8571323c535b5c1ce1b0532e88236b143b7e.tar.xz
Possible fix for: Remoting exceptions with adjacent non-running sims.
Bugs 449, 454, 408, 244, 197 implemented InformClientOfNeighbours as an asynchroneous process, handling timeouts without blocking the main thread. Improved logging of errors, removed catch all in try catch
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs1
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 81197fd..9800b74 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -482,6 +482,7 @@ namespace OpenSim.Grid.GridServer
482 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); 482 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
483 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); 483 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
484 simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); 484 simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated();
485 simProfileBlock["remoting_port"] = aSim.Value.remotingPort;
485 486
486 simProfileList.Add(simProfileBlock); 487 simProfileList.Add(simProfileBlock);
487 } 488 }
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 90fe2cf..e5728fe 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -1168,7 +1168,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1168 if (dynamicID == "") 1168 if (dynamicID == "")
1169 { 1169 {
1170 IDynamicTextureManager textureManager = this.World.RequestModuleInterface<IDynamicTextureManager>(); 1170 IDynamicTextureManager textureManager = this.World.RequestModuleInterface<IDynamicTextureManager>();
1171 LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.SimUUID, this.m_host.UUID, contentType, url, extraParams, timer); 1171 LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, this.m_host.UUID, contentType, url, extraParams, timer);
1172 return createdTexture.ToStringHyphenated(); 1172 return createdTexture.ToStringHyphenated();
1173 } 1173 }
1174 else 1174 else