diff options
| author | Diva Canto | 2013-07-09 14:12:52 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:12:52 -0700 |
| commit | 67e500383eb024fe4dd2681d0c5d902f289b65d8 (patch) | |
| tree | f3523d8849fd573208869bf8e0aa8a77eb2c2077 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
| parent | BaseHttpServer: if the handler sets the content length, don't override it. Th... (diff) | |
| download | opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.zip opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.gz opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.bz2 opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.xz | |
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 1eae0ac..e0c8ea6 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
| @@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 135 | if (sp is ScenePresence) | 135 | if (sp is ScenePresence) |
| 136 | { | 136 | { |
| 137 | AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId); | 137 | AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId); |
| 138 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | 138 | if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) |
| 139 | { | 139 | { |
| 140 | if (m_RestrictInventoryAccessAbroad) | 140 | if (m_RestrictInventoryAccessAbroad) |
| 141 | { | 141 | { |