diff options
| author | Melanie | 2009-08-15 19:00:56 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-15 19:00:56 +0100 |
| commit | 973be659459c577433b831c451ff07048aa078be (patch) | |
| tree | 887f0586edbb936cca2fb8381699d921a2299492 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Changed FromAssetID to FromItemID (diff) | |
| download | opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.zip opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.gz opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.bz2 opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.xz | |
Merge branch 'master' of ../opensim-diva/ into inventory-connector
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 691732a..2dbbf70 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2801,7 +2801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2801 | if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0) | 2801 | if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0) |
| 2802 | { | 2802 | { |
| 2803 | SceneObjectGroup grp = m_host.ParentGroup; | 2803 | SceneObjectGroup grp = m_host.ParentGroup; |
| 2804 | UUID itemID = grp.GetFromAssetID(); | 2804 | UUID itemID = grp.GetFromItemID(); |
| 2805 | 2805 | ||
| 2806 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 2806 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 2807 | 2807 | ||