diff options
| author | UbitUmarov | 2017-01-07 16:55:03 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-07 16:55:03 +0000 |
| commit | add27a503e2558b7ddeb951d3e42e09b1c04fb36 (patch) | |
| tree | 888ab5919cb52f1e0201fc4ab60987a0df022f1f /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | update permissions module with the new options (diff) | |
| download | opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.zip opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.gz opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.bz2 opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
| -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, |