diff options
author | Melanie Thielker | 2017-01-07 00:35:09 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-07 00:35:09 +0000 |
commit | ff945867a3c986d7a226322d234c4002ee682263 (patch) | |
tree | 6b0114417d273526fabff94742dceb0d62f9639e /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Remove a red ink error on shutdown. Harmless message since shutting down anyway (diff) | |
download | opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.zip opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.gz opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.bz2 opensim-SC_OLD-ff945867a3c986d7a226322d234c4002ee682263.tar.xz |
Squelch red ink for login cancel by the user during circuit setup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index f4a8a6b..8b8ac20 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -1118,7 +1118,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1118 | 1118 | ||
1119 | SceneObjectGroup objatt; | 1119 | SceneObjectGroup objatt; |
1120 | 1120 | ||
1121 | UUID rezGroupID = sp.ControllingClient.ActiveGroupId; | 1121 | UUID rezGroupID; |
1122 | |||
1123 | // This will fail if the user aborts login. sp will exist | ||
1124 | // but ControllintClient will be null. | ||
1125 | try | ||
1126 | { | ||
1127 | rezGroupID = sp.ControllingClient.ActiveGroupId; | ||
1128 | } | ||
1129 | catch | ||
1130 | { | ||
1131 | return null; | ||
1132 | } | ||
1122 | 1133 | ||
1123 | if (itemID != UUID.Zero) | 1134 | if (itemID != UUID.Zero) |
1124 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, | 1135 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, |