diff options
| author | Melanie | 2012-12-14 03:35:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-12-14 03:35:55 +0100 |
| commit | 7a093df24b470a6c80d67b1f8572f37a2a350521 (patch) | |
| tree | 64914dc326e53844af9e73d467046e111fe1781f | |
| parent | Check database for root prim IDs only to try and get a handle on prim loss (diff) | |
| download | opensim-SC-7a093df24b470a6c80d67b1f8572f37a2a350521.zip opensim-SC-7a093df24b470a6c80d67b1f8572f37a2a350521.tar.gz opensim-SC-7a093df24b470a6c80d67b1f8572f37a2a350521.tar.bz2 opensim-SC-7a093df24b470a6c80d67b1f8572f37a2a350521.tar.xz | |
Prevent a failed user relogi from throwing exceptions in poll services
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index 6b33561..908f628 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
| @@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 377 | protocol = "https"; | 377 | protocol = "https"; |
| 378 | } | 378 | } |
| 379 | caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | 379 | caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); |
| 380 | m_pollservices.Add(agentID, args); | 380 | m_pollservices[agentID] = args; |
| 381 | m_capsDict[agentID] = capUrl; | 381 | m_capsDict[agentID] = capUrl; |
| 382 | 382 | ||
| 383 | 383 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index dd87671..d4dbfb9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
| @@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 333 | protocol = "https"; | 333 | protocol = "https"; |
| 334 | } | 334 | } |
| 335 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | 335 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); |
| 336 | m_pollservices.Add(agentID, args); | 336 | m_pollservices[agentID] = args; |
| 337 | m_capsDict[agentID] = capUrl; | 337 | m_capsDict[agentID] = capUrl; |
| 338 | } | 338 | } |
| 339 | 339 | ||