diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz |
*remove conflicts
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-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 | ||