10 files changed, 64 insertions, 405 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 1a96098..26edba4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -128,6 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     + "<last> is the user's last name." + Environment.NewLine
                     + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
                     + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
+                    + "-c|--creators preserves information about foreign creators." + Environment.NewLine
                     + "-v|--verbose extra debug messages." + Environment.NewLine
                     + "<IAR path> is the filesystem path at which to save the IAR."
                     + string.Format("  If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
@@ -396,6 +397,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             //ops.Add("v|version=", delegate(string v) { options["version"] = v; });
             ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
             ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
+            ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 54b95f7..80a8041 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </summary>
         public void EnableChildAgent(ScenePresence sp, GridRegion region)
         {
-            m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
+            m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName);
 
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
             AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 34b8114..4565d10 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         }
 
         private string m_ProfileServerURI;
+        private bool m_OutboundPermission;
 
 //        private bool m_Initialized = false;
 
@@ -78,7 +79,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                     IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
                     if (thisModuleConfig != null)
+                    {
                         m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
+                        m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
+                    }
                     else
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
                 }
@@ -103,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel)
         {
             string userAssetServer = string.Empty;
-            if (IsForeignUser(avatarID, out userAssetServer))
+            if (IsForeignUser(avatarID, out userAssetServer) && m_OutboundPermission)
             {
                 Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); });
             }
@@ -197,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (IsForeignUser(sender, out userAssetServer))
                 m_assMapper.Get(item.AssetID, sender, userAssetServer);
 
-            if (IsForeignUser(receiver, out userAssetServer))
+            if (IsForeignUser(receiver, out userAssetServer) && m_OutboundPermission)
                 m_assMapper.Post(item.AssetID, receiver, userAssetServer);
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 39410b5..3f63db3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -200,6 +200,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                                 return;
                             }
                         }
+                        else
+                        {
+                            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: User {0} does not have InventoryServerURI. OH NOES!", userID);
+                            return;
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
deleted file mode 100644
index 9213132..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using log4net;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Statistics;
-using OpenSim.Services.Connectors;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public class RemoteInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private bool m_Enabled = false;
-        private bool m_Initialized = false;
-        private Scene m_Scene;
-        private InventoryServicesConnector m_RemoteConnector;
-
-        private IUserManagement m_UserManager;
-        private IUserManagement UserManager
-        {
-            get
-            {
-                if (m_UserManager == null)
-                {
-                    m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
-                }
-                return m_UserManager;
-            }
-        }
-
-
-        public Type ReplaceableInterface 
-        {
-            get { return null; }
-        }
-
-        public string Name
-        {
-            get { return "RemoteInventoryServicesConnector"; }
-        }
-
-        public RemoteInventoryServicesConnector()
-        {
-        }
-
-        public RemoteInventoryServicesConnector(IConfigSource source)
-        {
-            Init(source);
-        }
-
-        protected override void Init(IConfigSource source)
-        {
-            m_RemoteConnector = new InventoryServicesConnector(source);
-            base.Init(source);
-        }
-
-        #region ISharedRegionModule
-
-        public void Initialise(IConfigSource source)
-        {
-            IConfig moduleConfig = source.Configs["Modules"];
-            if (moduleConfig != null)
-            {
-                string name = moduleConfig.GetString("InventoryServices", "");
-                if (name == Name)
-                {
-                    Init(source);
-                    m_Enabled = true;
-
-                    m_log.Info("[INVENTORY CONNECTOR]: Remote inventory enabled");
-                }
-            }
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-//            m_Scene = scene;
-            //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
-
-            if (!m_Enabled)
-                return;
-
-            if (!m_Initialized)
-            {
-                m_Initialized = true;
-            }
-
-            scene.RegisterModuleInterface<IInventoryService>(this);
-            m_cache.AddRegion(scene);
-
-            if (m_Scene == null)
-                m_Scene = scene;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            m_cache.RemoveRegion(scene);
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled remote inventory for region {0}", scene.RegionInfo.RegionName);
-
-        }
-
-        #endregion ISharedRegionModule
-
-        #region IInventoryService
-
-        public override bool CreateUserInventory(UUID user)
-        {
-            return false;
-        }
-
-        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
-        {
-            return new List<InventoryFolderBase>();
-        }
-
-        public override InventoryCollection GetUserInventory(UUID userID)
-        {
-            return null;
-        }
-
-        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-            UUID sessionID = GetSessionID(userID);
-            try
-            {
-                m_RemoteConnector.GetUserInventory(userID.ToString(), sessionID, callback);
-            }
-            catch (Exception e)
-            {
-                if (StatsManager.SimExtraStats != null)
-                    StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
-
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Request inventory operation failed, {0} {1}",
-                    e.Source, e.Message);
-            }
-
-        }
-
-        // inherited. See base class
-        // public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-
-        public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
-        {
-            UUID sessionID = GetSessionID(userID);
-            return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID);
-        }
-
-        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
-        {
-            UUID sessionID = GetSessionID(userID);
-            try
-            {
-                InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID.ToString(), folderID, sessionID);
-                foreach (InventoryItemBase item in invCol.Items)
-                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                return invCol;
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1}",
-                    e.Source, e.Message);
-            }
-            InventoryCollection nullCollection = new InventoryCollection();
-            nullCollection.Folders = new List<InventoryFolderBase>();
-            nullCollection.Items = new List<InventoryItemBase>();
-            nullCollection.UserID = userID;
-            return nullCollection;
-        }
-
-        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
-        {
-            UUID sessionID = GetSessionID(userID);
-            return m_RemoteConnector.GetFolderItems(userID.ToString(), folderID, sessionID);
-        }
-
-        public override bool AddFolder(InventoryFolderBase folder)
-        {
-            if (folder == null)
-                return false;
-
-            UUID sessionID = GetSessionID(folder.Owner);
-            return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID);
-        }
-
-        public override bool UpdateFolder(InventoryFolderBase folder)
-        {
-            if (folder == null)
-                return false;
-
-            UUID sessionID = GetSessionID(folder.Owner);
-            return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID);
-        }
-
-        public override bool MoveFolder(InventoryFolderBase folder)
-        {
-            if (folder == null)
-                return false;
-
-            UUID sessionID = GetSessionID(folder.Owner);
-            return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID);
-        }
-
-        public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
-        {
-            if (folderIDs == null)
-                return false;
-            if (folderIDs.Count == 0)
-                return false;
-
-            UUID sessionID = GetSessionID(ownerID);
-            return m_RemoteConnector.DeleteFolders(ownerID.ToString(), folderIDs, sessionID);
-        }
-
-
-        public override bool PurgeFolder(InventoryFolderBase folder)
-        {
-            if (folder == null)
-                return false;
-
-            UUID sessionID = GetSessionID(folder.Owner);
-            return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID);
-        }
-
-        // public bool AddItem(InventoryItemBase item) inherited
-        // Uses AddItemPlain
-
-        protected override bool AddItemPlain(InventoryItemBase item)
-        {
-            if (item == null)
-                return false;
-
-            UUID sessionID = GetSessionID(item.Owner);
-            return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID);
-        }
-
-        public override bool UpdateItem(InventoryItemBase item)
-        {
-            if (item == null)
-                return false;
-
-            UUID sessionID = GetSessionID(item.Owner);
-            return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID);
-        }
-
-        public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
-        {
-            if (items == null)
-                return false;
-
-            UUID sessionID = GetSessionID(ownerID);
-            return m_RemoteConnector.MoveItems(ownerID.ToString(), items, sessionID);
-        }
-
-
-        public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
-        {
-            if (itemIDs == null)
-                return false;
-            if (itemIDs.Count == 0)
-                return true;
-
-            UUID sessionID = GetSessionID(ownerID);
-            return m_RemoteConnector.DeleteItems(ownerID.ToString(), itemIDs, sessionID);
-        }
-
-        public override InventoryItemBase GetItem(InventoryItemBase item)
-        {
-            if (item == null)
-                return null;
-
-            UUID sessionID = GetSessionID(item.Owner);
-            return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
-        }
-
-        public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
-        {
-            if (folder == null)
-                return null;
-
-            UUID sessionID = GetSessionID(folder.Owner);
-            return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID);
-        }
-
-        public override bool HasInventoryForUser(UUID userID)
-        {
-            return false;
-        }
-
-        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
-        {
-            return new List<InventoryItemBase>();
-        }
-
-        public override int GetAssetPermissions(UUID userID, UUID assetID)
-        {
-            UUID sessionID = GetSessionID(userID);
-            return m_RemoteConnector.GetAssetPermissions(userID.ToString(), assetID, sessionID);
-        }
-
-
-        #endregion
-
-        private UUID GetSessionID(UUID userID)
-        {
-            return UUID.Zero;
-        }
-
-    }
-}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index c5972dd..56720b7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -225,17 +225,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             if (destination == null)
                 return false;
 
+            // We limit the number of messages sent for a position change to just one per
+            // simulator so when we receive the update we need to hand it to each of the
+            // scenes; scenes each check to see if the is a scene presence for the avatar
+            // note that we really don't need the GridRegion for this call
             foreach (Scene s in m_sceneList)
             {
-                if (s.RegionInfo.RegionHandle == destination.RegionHandle)
-                {
-                    //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
-                    s.IncomingChildAgentDataUpdate(cAgentData);
-                    return true;
-                }
+                //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
+                s.IncomingChildAgentDataUpdate(cAgentData);
             }
             //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
-            return false;
+            return true;
         }
 
         public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index f8ff308..837e655 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -193,7 +193,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, ulong regionHandle);
+        public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, GridRegion dest);
+        
 
         /// <summary>
         /// This informs all neighboring regions about the settings of it's child agent.
@@ -202,31 +203,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
         ///
         /// </summary>
-        private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, ulong regionHandle)
+        private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, GridRegion dest)
         {
             //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName);
             try
             {
-                //m_commsProvider.InterRegion.ChildAgentUpdate(regionHandle, cAgentData);
-                uint x = 0, y = 0;
-                Utils.LongToUInts(regionHandle, out x, out y);
-                GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-                m_scene.SimulationService.UpdateAgent(destination, cAgentData);
+                m_scene.SimulationService.UpdateAgent(dest, cAgentData);
             }
             catch
             {
                 // Ignore; we did our best
             }
-
-            //if (regionAccepted)
-            //{
-            //    //m_log.Info("[INTERGRID]: Completed sending a neighbor an update about my agent");
-            //}
-            //else
-            //{
-            //    //m_log.Info("[INTERGRID]: Failed sending a neighbor an update about my agent");
-            //}
-                
         }
 
         private void SendChildAgentDataUpdateCompleted(IAsyncResult iar)
@@ -240,14 +227,28 @@ namespace OpenSim.Region.Framework.Scenes
             // This assumes that we know what our neighbors are.
             try
             {
+                uint x = 0, y = 0;
+                List<string> simulatorList = new List<string>();
                 foreach (ulong regionHandle in presence.KnownChildRegionHandles)
                 {
                     if (regionHandle != m_regionInfo.RegionHandle)
                     {
-                        SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
-                        d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, regionHandle,
-                                      SendChildAgentDataUpdateCompleted,
-                                      d);
+                        // we only want to send one update to each simulator; the simulator will
+                        // hand it off to the regions where a child agent exists, this does assume
+                        // that the region position is cached or performance will degrade
+                        Utils.LongToUInts(regionHandle, out x, out y);
+                        GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
+                        if (! simulatorList.Contains(dest.ServerURI))
+                        {
+                            // we havent seen this simulator before, add it to the list
+                            // and send it an update
+                            simulatorList.Add(dest.ServerURI);
+
+                            SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
+                            d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
+                                          SendChildAgentDataUpdateCompleted,
+                                          d);
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4fcd8f5..6a92378 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2055,8 +2055,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void GetProperties(IClientAPI client)
         {
+            //Viewer wants date in microseconds so multiply it by 1,000,000.
             client.SendObjectPropertiesReply(
-                m_fromUserInventoryItemID, (ulong)_creationDate, _creatorID, UUID.Zero, UUID.Zero,
+                m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero,
                 _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID,
                 ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
                 ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask,
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
 
         protected void SetTexture(SceneObjectPart part, string texture, int face)
         {
-            UUID textureID=new UUID();
+            UUID textureID = new UUID();
 
-            if (!UUID.TryParse(texture, out textureID))
-            {
-                textureID=InventoryKey(texture, (int)AssetType.Texture);
-            }
-
-            if (textureID == UUID.Zero)
-                return;
+                    textureID = InventoryKey(texture, (int)AssetType.Texture);
+                    if (textureID == UUID.Zero)
+                    {
+                            if (!UUID.TryParse(texture, out textureID))
+                                return;
+                    }
 
             Primitive.TextureEntry tex = part.Shape.Textures;
 
@@ -3062,14 +3061,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             msg.fromGroup = false;// fromGroup;
             msg.offline = (byte)0; //offline;
             msg.ParentEstateID = 0; //ParentEstateID;
-            msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition);
+            msg.Position = new Vector3(m_host.AbsolutePosition);
             msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
-            msg.binaryBucket = new byte[0];// binaryBucket;
+            msg.binaryBucket 
+                = Util.StringToBytes256(
+                    "{0}/{1}/{2}/{3}", 
+                    World.RegionInfo.RegionName, 
+                    (int)Math.Floor(m_host.AbsolutePosition.X), 
+                    (int)Math.Floor(m_host.AbsolutePosition.Y), 
+                    (int)Math.Floor(m_host.AbsolutePosition.Z));
 
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
             }
+            
             ScriptSleep(2000);
       }
 
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
                         // and convert the regionName to the target region
                         if (regionName.Contains(".") && regionName.Contains(":"))
                         {
-//                            List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
+                            World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
+//                            List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);                            
+                            
                             string[] parts = regionName.Split(new char[] { ':' });
                             if (parts.Length > 2)
                                 regionName = parts[0] + ':' + parts[1] + "/ " + parts[2];