diff options
author | Melanie | 2012-02-01 09:45:15 +0000 |
---|---|---|
committer | Melanie | 2012-02-01 09:45:15 +0000 |
commit | 241ddd031f36eda9f1339398ae30d52c1b9e83e5 (patch) | |
tree | 8ba2d3c99fb893b0598c440c8ff8020e7b380412 /OpenSim/Region/Framework | |
parent | Prevent a changed attachment that has been saved from being saved again. (diff) | |
download | opensim-SC_OLD-241ddd031f36eda9f1339398ae30d52c1b9e83e5.zip opensim-SC_OLD-241ddd031f36eda9f1339398ae30d52c1b9e83e5.tar.gz opensim-SC_OLD-241ddd031f36eda9f1339398ae30d52c1b9e83e5.tar.bz2 opensim-SC_OLD-241ddd031f36eda9f1339398ae30d52c1b9e83e5.tar.xz |
Fix copy/paste errors
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index e668dae..eb07165 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
46 | /// Save the attachments that have change on this presence. | 46 | /// Save the attachments that have change on this presence. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="sp"></param> | 48 | /// <param name="sp"></param> |
49 | void SaveChangedAttachments(IScenePresence sp); | 49 | void SaveChangedAttachments(IScenePresence sp, bool saveAllScripted); |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Delete all the presence's attachments from the scene | 52 | /// Delete all the presence's attachments from the scene |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 34d1151..2af4a1c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3105,14 +3105,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
3105 | 3105 | ||
3106 | if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) | 3106 | if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) |
3107 | { | 3107 | { |
3108 | IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); | 3108 | IUserManagement uMan = RequestModuleInterface<IUserManagement>(); |
3109 | // Don't save attachments for HG visitors, it | 3109 | // Don't save attachments for HG visitors, it |
3110 | // messes up their inventory. When a HG visitor logs | 3110 | // messes up their inventory. When a HG visitor logs |
3111 | // out on a foreign grid, their attachments will be | 3111 | // out on a foreign grid, their attachments will be |
3112 | // reloaded in the state they were in when they left | 3112 | // reloaded in the state they were in when they left |
3113 | // the home grid. This is best anyway as the visited | 3113 | // the home grid. This is best anyway as the visited |
3114 | // grid may use an incompatible script engine. | 3114 | // grid may use an incompatible script engine. |
3115 | if (uMan == null || uMan.IsLocalGridUser(id)) | 3115 | if (uMan == null || uMan.IsLocalGridUser(avatar.UUID)) |
3116 | AttachmentsModule.SaveChangedAttachments(avatar, false); | 3116 | AttachmentsModule.SaveChangedAttachments(avatar, false); |
3117 | } | 3117 | } |
3118 | 3118 | ||