OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix copy/paste errors

iar_mods
Melanie 2012-02-01 09:45:15 +00:00
parent c08d6df7e1
commit 241ddd031f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// Save the attachments that have change on this presence. /// Save the attachments that have change on this presence.
/// </summary> /// </summary>
/// <param name="sp"></param> /// <param name="sp"></param>
void SaveChangedAttachments(IScenePresence sp); void SaveChangedAttachments(IScenePresence sp, bool saveAllScripted);
/// <summary> /// <summary>
/// Delete all the presence's attachments from the scene /// Delete all the presence's attachments from the scene

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3105,14 +3105,14 @@ namespace OpenSim.Region.Framework.Scenes
if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc)
{ {
IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); IUserManagement uMan = RequestModuleInterface<IUserManagement>();
// Don't save attachments for HG visitors, it // Don't save attachments for HG visitors, it
// messes up their inventory. When a HG visitor logs // messes up their inventory. When a HG visitor logs
// out on a foreign grid, their attachments will be // out on a foreign grid, their attachments will be
// reloaded in the state they were in when they left // reloaded in the state they were in when they left
// the home grid. This is best anyway as the visited // the home grid. This is best anyway as the visited
// grid may use an incompatible script engine. // grid may use an incompatible script engine.
if (uMan == null || uMan.IsLocalGridUser(id)) if (uMan == null || uMan.IsLocalGridUser(avatar.UUID))
AttachmentsModule.SaveChangedAttachments(avatar, false); AttachmentsModule.SaveChangedAttachments(avatar, false);
} }