diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cd72dc2..ce1c364 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6885,22 +6885,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6885 | if (folderID == UUID.Zero) | 6885 | if (folderID == UUID.Zero) |
6886 | return; | 6886 | return; |
6887 | 6887 | ||
6888 | byte[] bucket = new byte[1]; | ||
6889 | bucket[0] = (byte)AssetType.Folder; | ||
6890 | //byte[] objBytes = folderID.GetBytes(); | ||
6891 | //Array.Copy(objBytes, 0, bucket, 1, 16); | ||
6892 | |||
6893 | GridInstantMessage msg = new GridInstantMessage(World, | ||
6894 | m_host.OwnerID, m_host.Name, destID, | ||
6895 | (byte)InstantMessageDialog.TaskInventoryOffered, | ||
6896 | false, category+". "+m_host.Name+" is located at "+ | ||
6897 | World.RegionInfo.RegionName+" "+ | ||
6898 | m_host.AbsolutePosition.ToString(), | ||
6899 | folderID, true, m_host.AbsolutePosition, | ||
6900 | bucket); | ||
6901 | |||
6902 | if (m_TransferModule != null) | 6888 | if (m_TransferModule != null) |
6889 | { | ||
6890 | byte[] bucket = new byte[] { (byte)AssetType.Folder }; | ||
6891 | |||
6892 | GridInstantMessage msg = new GridInstantMessage(World, | ||
6893 | m_host.UUID, m_host.Name + ", an object owned by " + | ||
6894 | resolveName(m_host.OwnerID) + ",", destID, | ||
6895 | (byte)InstantMessageDialog.TaskInventoryOffered, | ||
6896 | false, category + "\n" + m_host.Name + " is located at " + | ||
6897 | World.RegionInfo.RegionName + " " + | ||
6898 | m_host.AbsolutePosition.ToString(), | ||
6899 | folderID, true, m_host.AbsolutePosition, | ||
6900 | bucket); | ||
6901 | |||
6903 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 6902 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
6903 | } | ||
6904 | } | 6904 | } |
6905 | 6905 | ||
6906 | public void llSetVehicleType(int type) | 6906 | public void llSetVehicleType(int type) |
@@ -11847,7 +11847,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11847 | break; | 11847 | break; |
11848 | case ScriptBaseClass.OBJECT_ROT: | 11848 | case ScriptBaseClass.OBJECT_ROT: |
11849 | { | 11849 | { |
11850 | Quaternion rot = Quaternion.Identity; | 11850 | Quaternion rot = Quaternion.Identity; |
11851 | 11851 | ||
11852 | if (obj.ParentGroup.RootPart == obj) | 11852 | if (obj.ParentGroup.RootPart == obj) |
11853 | rot = obj.ParentGroup.GroupRotation; | 11853 | rot = obj.ParentGroup.GroupRotation; |