aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-02-01 09:36:14 +0000
committerMelanie2012-02-01 09:36:14 +0000
commitfcc1fa2c32af3df8962e470150b641dda036a8ab (patch)
tree8d9ebb1697afdef379226bb8f2aa6e4d00ede483 /OpenSim/Region/Framework
parentMove object delete commands into a commands region module, in preparation for... (diff)
downloadopensim-SC_OLD-fcc1fa2c32af3df8962e470150b641dda036a8ab.zip
opensim-SC_OLD-fcc1fa2c32af3df8962e470150b641dda036a8ab.tar.gz
opensim-SC_OLD-fcc1fa2c32af3df8962e470150b641dda036a8ab.tar.bz2
opensim-SC_OLD-fcc1fa2c32af3df8962e470150b641dda036a8ab.tar.xz
Straighten out some attachment mess. Don't save attachment states for HG
visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index df6c88f..34d1151 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3104,7 +3104,17 @@ namespace OpenSim.Region.Framework.Scenes
3104 m_eventManager.TriggerOnRemovePresence(agentID); 3104 m_eventManager.TriggerOnRemovePresence(agentID);
3105 3105
3106 if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) 3106 if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc)
3107 AttachmentsModule.SaveChangedAttachments(avatar); 3107 {
3108 IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>();
3109 // Don't save attachments for HG visitors, it
3110 // messes up their inventory. When a HG visitor logs
3111 // out on a foreign grid, their attachments will be
3112 // reloaded in the state they were in when they left
3113 // the home grid. This is best anyway as the visited
3114 // grid may use an incompatible script engine.
3115 if (uMan == null || uMan.IsLocalGridUser(id))
3116 AttachmentsModule.SaveChangedAttachments(avatar, false);
3117 }
3108 3118
3109 ForEachClient( 3119 ForEachClient(
3110 delegate(IClientAPI client) 3120 delegate(IClientAPI client)