aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-08-14 02:11:13 +0100
committerMelanie2012-08-14 02:11:13 +0100
commit053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch)
tree772fd824cbbe5a6bc594875ac3ee03c00115cef5 /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
parentImplement the temp attachments. UNTESTED (diff)
downloadopensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8cbebbb..54cb214 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3346,7 +3346,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3346 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3346 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3347 3347
3348 if (attachmentsModule != null) 3348 if (attachmentsModule != null)
3349 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true); 3349 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false);
3350 else 3350 else
3351 return false; 3351 return false;
3352 } 3352 }