diff options
author | Melanie | 2012-02-01 10:08:45 +0000 |
---|---|---|
committer | Melanie | 2012-02-01 10:08:45 +0000 |
commit | 16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe (patch) | |
tree | 1ffd8f2989976713ea79bbc1017a58a8925f1793 /OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Small optimization to last commit (diff) | |
download | opensim-SC_OLD-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.zip opensim-SC_OLD-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.gz opensim-SC_OLD-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.bz2 opensim-SC_OLD-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index a7770ad..69ce967 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
47 | /// Save the attachments that have change on this presence. | 47 | /// Save the attachments that have change on this presence. |
48 | /// </summary> | 48 | /// </summary> |
49 | /// <param name="sp"></param> | 49 | /// <param name="sp"></param> |
50 | void SaveChangedAttachments(IScenePresence sp); | 50 | void SaveChangedAttachments(IScenePresence sp, bool saveAllScripted); |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Delete all the presence's attachments from the scene | 53 | /// Delete all the presence's attachments from the scene |