diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 26 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
2 files changed, 19 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 30fb252..72ee495 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1748,15 +1748,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1748 | 1748 | ||
1749 | protected void SetTexture(SceneObjectPart part, string texture, int face) | 1749 | protected void SetTexture(SceneObjectPart part, string texture, int face) |
1750 | { | 1750 | { |
1751 | UUID textureID=new UUID(); | 1751 | UUID textureID = new UUID(); |
1752 | 1752 | ||
1753 | if (!UUID.TryParse(texture, out textureID)) | 1753 | textureID = InventoryKey(texture, (int)AssetType.Texture); |
1754 | { | 1754 | if (textureID == UUID.Zero) |
1755 | textureID=InventoryKey(texture, (int)AssetType.Texture); | 1755 | { |
1756 | } | 1756 | if (!UUID.TryParse(texture, out textureID)) |
1757 | 1757 | return; | |
1758 | if (textureID == UUID.Zero) | 1758 | } |
1759 | return; | ||
1760 | 1759 | ||
1761 | Primitive.TextureEntry tex = part.Shape.Textures; | 1760 | Primitive.TextureEntry tex = part.Shape.Textures; |
1762 | 1761 | ||
@@ -3062,14 +3061,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3062 | msg.fromGroup = false;// fromGroup; | 3061 | msg.fromGroup = false;// fromGroup; |
3063 | msg.offline = (byte)0; //offline; | 3062 | msg.offline = (byte)0; //offline; |
3064 | msg.ParentEstateID = 0; //ParentEstateID; | 3063 | msg.ParentEstateID = 0; //ParentEstateID; |
3065 | msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); | 3064 | msg.Position = new Vector3(m_host.AbsolutePosition); |
3066 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; | 3065 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; |
3067 | msg.binaryBucket = new byte[0];// binaryBucket; | 3066 | msg.binaryBucket |
3067 | = Util.StringToBytes256( | ||
3068 | "{0}/{1}/{2}/{3}", | ||
3069 | World.RegionInfo.RegionName, | ||
3070 | (int)Math.Floor(m_host.AbsolutePosition.X), | ||
3071 | (int)Math.Floor(m_host.AbsolutePosition.Y), | ||
3072 | (int)Math.Floor(m_host.AbsolutePosition.Z)); | ||
3068 | 3073 | ||
3069 | if (m_TransferModule != null) | 3074 | if (m_TransferModule != null) |
3070 | { | 3075 | { |
3071 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 3076 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3072 | } | 3077 | } |
3078 | |||
3073 | ScriptSleep(2000); | 3079 | ScriptSleep(2000); |
3074 | } | 3080 | } |
3075 | 3081 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c0c790d..3f8735e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -702,7 +702,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
702 | // and convert the regionName to the target region | 702 | // and convert the regionName to the target region |
703 | if (regionName.Contains(".") && regionName.Contains(":")) | 703 | if (regionName.Contains(".") && regionName.Contains(":")) |
704 | { | 704 | { |
705 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | 705 | World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); |
706 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | ||
707 | |||
706 | string[] parts = regionName.Split(new char[] { ':' }); | 708 | string[] parts = regionName.Split(new char[] { ':' }); |
707 | if (parts.Length > 2) | 709 | if (parts.Length > 2) |
708 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; | 710 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; |