4 files changed, 7 insertions, 68 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 68538c9..a71def7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -128,11 +128,8 @@ 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
-<<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
-=======
                     + "-c|--creators preserves information about foreign creators." + Environment.NewLine
                     + "-v|--verbose extra debug messages." + Environment.NewLine
->>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
                     + "<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),
                     HandleSaveInvConsoleCommand);
@@ -399,11 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             OptionSet ops = new OptionSet();
             //ops.Add("v|version=", delegate(string v) { options["version"] = v; });
             ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
-<<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
-=======
             ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
             ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
->>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
 
             List<string> mainParams = ops.Parse(cmdparams);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e6ebc6e..673ea46 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1917,14 +1917,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void SetTexture(SceneObjectPart part, string texture, int face)
         {
-<<<<<<< HEAD:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return;
 
-            UUID textureID=new UUID();
-=======
             UUID textureID = new UUID();
->>>>>>> master:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 
                     textureID = InventoryKey(texture, (int)AssetType.Texture);
                     if (textureID == UUID.Zero)
@@ -3346,15 +3342,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             msg.dialog = (byte)19; // MessageFromObject
             msg.fromGroup = false;// fromGroup;
             msg.offline = (byte)0; //offline;
-<<<<<<< HEAD:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
             msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
             msg.Position = new Vector3(m_host.AbsolutePosition);
             msg.RegionID = World.RegionInfo.RegionID.Guid;
-            msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
-=======
-            msg.ParentEstateID = 0; //ParentEstateID;
-            msg.Position = new Vector3(m_host.AbsolutePosition);
-            msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
             msg.binaryBucket 
                 = Util.StringToBytes256(
                     "{0}/{1}/{2}/{3}", 
@@ -3362,7 +3352,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     (int)Math.Floor(m_host.AbsolutePosition.X), 
                     (int)Math.Floor(m_host.AbsolutePosition.Y), 
                     (int)Math.Floor(m_host.AbsolutePosition.Z));
->>>>>>> master:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 
             if (m_TransferModule != null)
             {
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index a6dc287..b33b0d5 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -110,14 +110,11 @@ namespace OpenSim.Server.Handlers.Simulation
                 DoAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
-<<<<<<< HEAD:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("DELETECHILD"))
             {
                 DoChildAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
-=======
->>>>>>> master:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("QUERYACCESS"))
             {
                 DoQueryAccess(request, responsedata, agentID, regionID);
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 553c116..e0d8103 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -180,60 +180,19 @@ namespace OpenSim.Services.GridService
         public GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason)
         {
             reason = string.Empty;
-            string host = "127.0.0.1";
-            string portstr;
-            string regionName = "";
             uint port = 0;
-            string[] parts = mapName.Split(new char[] { ':' });
-            if (parts.Length >= 1)
+            string[] parts = mapName.Split(new char[] {':'});
+            string regionName = String.Empty;
+            if (parts.Length > 1)
             {
-                host = parts[0];
+                regionName = mapName.Substring(parts[0].Length + 1);
+                regionName = regionName.Trim(new char[] {'"'});
             }
-            if (parts.Length >= 2)
-            {
-<<<<<<< HEAD:OpenSim/Services/GridService/HypergridLinker.cs
-                portstr = parts[1];
-                //m_log.Debug("-- port = " + portstr);
-                if (!UInt32.TryParse(portstr, out port))
-                    regionName = parts[1];
-            }
-            // always take the last one
-            if (parts.Length >= 3)
-            {
-                regionName = parts[2];
-            }
-
-            //// Sanity check. 
-            //try
-            //{
-            //    Util.GetHostFromDNS(host);
-            //}
-            //catch 
-            //{
-            //    reason = "Malformed hostname";
-            //    return null;
-            //}
-
             GridRegion regInfo;
-            bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason);
-            if (success)
+            if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason))
             {
-                regInfo.RegionName = mapName;
+                regInfo.RegionName = mapName; 
                 return regInfo;
-=======
-                string[] parts = mapName.Split(new char[] {' '});
-                string regionName = String.Empty;
-                if (parts.Length > 1)
-                {
-                    regionName = mapName.Substring(parts[0].Length + 1);
-                    regionName = regionName.Trim(new char[] {'"'});
-                }
-                if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason))
-                {
-                    regInfo.RegionName = mapName; 
-                    return regInfo;
-                }
->>>>>>> master:OpenSim/Services/GridService/HypergridLinker.cs
             }
 
             return null;