Update svn properties.

3 files changed, 544 insertions, 544 deletions

diff --git a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
index 31e0aa9..677169d 100644
--- a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
@@ -1,178 +1,178 @@
-/*

- * 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 Nini.Config;

-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using OpenSim.Framework;

-using OpenSim.Services.Interfaces;

-

-namespace OpenSim.Services.Connectors

-{

-    public class HGAssetServiceConnector : IAssetService

-    {

-        private static readonly ILog m_log =

-                LogManager.GetLogger(

-                MethodBase.GetCurrentMethod().DeclaringType);

-

-        private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();

-

-        public HGAssetServiceConnector(IConfigSource source)

-        {

-            IConfig moduleConfig = source.Configs["Modules"];

-            if (moduleConfig != null)

-            {

-                // string name = moduleConfig.GetString("AssetServices", "");

-

-                IConfig assetConfig = source.Configs["AssetService"];

-                if (assetConfig == null)

-                {

-                    m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpenSim.ini");

-                    return;

-                }

-

-                m_log.Info("[HG ASSET SERVICE]: HG asset service enabled");

-            }

-        }

-

-        private bool StringToUrlAndAssetID(string id, out string url, out string assetID)

-        {

-            url = String.Empty;

-            assetID = String.Empty;

-

-            Uri assetUri;

-

-            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&

-                    assetUri.Scheme == Uri.UriSchemeHttp)

-            {

-                url = "http://" + assetUri.Authority;

-                assetID = assetUri.LocalPath.Trim(new char[] {'/'});

-                return true;

-            }

-

-            return false;

-        }

-

-        private IAssetService GetConnector(string url)

-        {

-            AssetServicesConnector connector = null;

-            lock (m_connectors)

-            {

-                if (m_connectors.ContainsKey(url))

-                {

-                    connector = m_connectors[url];

-                }

-                else

-                {

-                    // We're instantiating this class explicitly, but this won't

-                    // work in general, because the remote grid may be running

-                    // an asset server that has a different protocol.

-                    // Eventually we will want a piece of protocol asking

-                    // the remote server about its kind. Definitely cool thing to do!

-                    connector = new AssetServicesConnector(url);

-                    m_connectors.Add(url, connector);

-                }

-            }

-            return connector;

-        }

-

-        public AssetBase Get(string id)

-        {

-            string url = string.Empty;

-            string assetID = string.Empty;

-

-            if (StringToUrlAndAssetID(id, out url, out assetID))

-            {

-                IAssetService connector = GetConnector(url);

-                return connector.Get(assetID);

-            }

-

-            return null;

-        }

-

-        public AssetMetadata GetMetadata(string id)

-        {

-            string url = string.Empty;

-            string assetID = string.Empty;

-

-            if (StringToUrlAndAssetID(id, out url, out assetID))

-            {

-                IAssetService connector = GetConnector(url);

-                return connector.GetMetadata(assetID);

-            }

-

-            return null;

-        }

-

-        public byte[] GetData(string id)

-        {

-            return null;

-        }

-

-        public bool Get(string id, Object sender, AssetRetrieved handler)

-        {

-            string url = string.Empty;

-            string assetID = string.Empty;

-

-            if (StringToUrlAndAssetID(id, out url, out assetID))

-            {

-                IAssetService connector = GetConnector(url);

-                return connector.Get(assetID, sender, handler);

-            }

-

-            return false;

-        }

-

-        public string Store(AssetBase asset)

-        {

-            string url = string.Empty;

-            string assetID = string.Empty;

-

-            if (StringToUrlAndAssetID(asset.ID, out url, out assetID))

-            {

-                IAssetService connector = GetConnector(url);

-                // Restore the assetID to a simple UUID

-                asset.ID = assetID;

-                return connector.Store(asset);

-            }

-

-            return String.Empty;

-        }

-

-        public bool UpdateContent(string id, byte[] data)

-        {

-            return false;

-        }

-

-        public bool Delete(string id)

-        {

-            return false;

-        }

-    }

-}

+/*
+ * 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 Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.Connectors
+{
+    public class HGAssetServiceConnector : IAssetService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();
+
+        public HGAssetServiceConnector(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                // string name = moduleConfig.GetString("AssetServices", "");
+
+                IConfig assetConfig = source.Configs["AssetService"];
+                if (assetConfig == null)
+                {
+                    m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpenSim.ini");
+                    return;
+                }
+
+                m_log.Info("[HG ASSET SERVICE]: HG asset service enabled");
+            }
+        }
+
+        private bool StringToUrlAndAssetID(string id, out string url, out string assetID)
+        {
+            url = String.Empty;
+            assetID = String.Empty;
+
+            Uri assetUri;
+
+            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
+                    assetUri.Scheme == Uri.UriSchemeHttp)
+            {
+                url = "http://" + assetUri.Authority;
+                assetID = assetUri.LocalPath.Trim(new char[] {'/'});
+                return true;
+            }
+
+            return false;
+        }
+
+        private IAssetService GetConnector(string url)
+        {
+            AssetServicesConnector connector = null;
+            lock (m_connectors)
+            {
+                if (m_connectors.ContainsKey(url))
+                {
+                    connector = m_connectors[url];
+                }
+                else
+                {
+                    // We're instantiating this class explicitly, but this won't
+                    // work in general, because the remote grid may be running
+                    // an asset server that has a different protocol.
+                    // Eventually we will want a piece of protocol asking
+                    // the remote server about its kind. Definitely cool thing to do!
+                    connector = new AssetServicesConnector(url);
+                    m_connectors.Add(url, connector);
+                }
+            }
+            return connector;
+        }
+
+        public AssetBase Get(string id)
+        {
+            string url = string.Empty;
+            string assetID = string.Empty;
+
+            if (StringToUrlAndAssetID(id, out url, out assetID))
+            {
+                IAssetService connector = GetConnector(url);
+                return connector.Get(assetID);
+            }
+
+            return null;
+        }
+
+        public AssetMetadata GetMetadata(string id)
+        {
+            string url = string.Empty;
+            string assetID = string.Empty;
+
+            if (StringToUrlAndAssetID(id, out url, out assetID))
+            {
+                IAssetService connector = GetConnector(url);
+                return connector.GetMetadata(assetID);
+            }
+
+            return null;
+        }
+
+        public byte[] GetData(string id)
+        {
+            return null;
+        }
+
+        public bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            string url = string.Empty;
+            string assetID = string.Empty;
+
+            if (StringToUrlAndAssetID(id, out url, out assetID))
+            {
+                IAssetService connector = GetConnector(url);
+                return connector.Get(assetID, sender, handler);
+            }
+
+            return false;
+        }
+
+        public string Store(AssetBase asset)
+        {
+            string url = string.Empty;
+            string assetID = string.Empty;
+
+            if (StringToUrlAndAssetID(asset.ID, out url, out assetID))
+            {
+                IAssetService connector = GetConnector(url);
+                // Restore the assetID to a simple UUID
+                asset.ID = assetID;
+                return connector.Store(asset);
+            }
+
+            return String.Empty;
+        }
+
+        public bool UpdateContent(string id, byte[] data)
+        {
+            return false;
+        }
+
+        public bool Delete(string id)
+        {
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index e943ae4..01e517c 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -1,241 +1,241 @@
-/*

- * 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 Nini.Config;

-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using OpenSim.Framework;

-using OpenSim.Services.Interfaces;

-using OpenMetaverse;

-

-namespace OpenSim.Services.Connectors.Inventory

-{

-    public class HGInventoryServiceConnector : ISessionAuthInventoryService

-    {

-        private static readonly ILog m_log =

-                LogManager.GetLogger(

-                MethodBase.GetCurrentMethod().DeclaringType);

-

-        private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>();

-

-        public HGInventoryServiceConnector(IConfigSource source)

-        {

-            IConfig moduleConfig = source.Configs["Modules"];

-            if (moduleConfig != null)

-            {

-

-                IConfig inventoryConfig = source.Configs["InventoryService"];

-                if (inventoryConfig == null)

-                {

-                    m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini");

-                    return;

-                }

-

-                m_log.Info("[HG INVENTORY SERVICE]: HG inventory service enabled");

-            }

-        }

-

-        private bool StringToUrlAndUserID(string id, out string url, out string userID)

-        {

-            url = String.Empty;

-            userID = String.Empty;

-

-            Uri assetUri;

-

-            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&

-                    assetUri.Scheme == Uri.UriSchemeHttp)

-            {

-                url = "http://" + assetUri.Authority;

-                userID = assetUri.LocalPath.Trim(new char[] { '/' });

-                return true;

-            }

-

-            return false;

-        }

-        private ISessionAuthInventoryService GetConnector(string url)

-        {

-            InventoryServicesConnector connector = null;

-            lock (m_connectors)

-            {

-                if (m_connectors.ContainsKey(url))

-                {

-                    connector = m_connectors[url];

-                }

-                else

-                {

-                    // We're instantiating this class explicitly, but this won't

-                    // work in general, because the remote grid may be running

-                    // an inventory server that has a different protocol.

-                    // Eventually we will want a piece of protocol asking

-                    // the remote server about its kind. Definitely cool thing to do!

-                    connector = new InventoryServicesConnector(url);

-                    m_connectors.Add(url, connector);

-                }

-            }

-            return connector;

-        }

-

-        public string Host

-        {

-            get { return string.Empty; }

-        }

-

-        public void GetUserInventory(string id, UUID sessionID, InventoryReceiptCallback callback)

-        {

-            m_log.Debug("[HGInventory]: GetUserInventory " + id);

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                connector.GetUserInventory(userID, sessionID, callback);

-            }

-

-        }

-

-        public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.AddFolder(userID, folder, sessionID);

-            }

-            return false;

-        }

-

-        public bool UpdateFolder(string id, InventoryFolderBase folder, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.UpdateFolder(userID, folder, sessionID);

-            }

-            return false;

-        }

-

-        public bool MoveFolder(string id, InventoryFolderBase folder, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.MoveFolder(userID, folder, sessionID);

-            }

-            return false;

-        }

-

-        public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.PurgeFolder(userID, folder, sessionID);

-            }

-            return false;

-        }

-

-        public bool AddItem(string id, InventoryItemBase item, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.AddItem(userID, item, sessionID);

-            }

-            return false;

-        }

-

-        public bool UpdateItem(string id, InventoryItemBase item, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.UpdateItem(userID, item, sessionID);

-            }

-            return false;

-        }

-

-        public bool DeleteItem(string id, InventoryItemBase item, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.UpdateItem(userID, item, sessionID);

-            }

-            return false;

-        }

-

-        public InventoryItemBase QueryItem(string id, InventoryItemBase item, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.QueryItem(userID, item, sessionID);

-            }

-            return null;

-        }

-

-        public InventoryFolderBase QueryFolder(string id, InventoryFolderBase folder, UUID sessionID)

-        {

-            string url = string.Empty;

-            string userID = string.Empty;

-

-            if (StringToUrlAndUserID(id, out url, out userID))

-            {

-                ISessionAuthInventoryService connector = GetConnector(url);

-                return connector.QueryFolder(userID, folder, sessionID);

-            }

-            return null;

-        }

-

-    }

-}

+/*
+ * 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 Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors.Inventory
+{
+    public class HGInventoryServiceConnector : ISessionAuthInventoryService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>();
+
+        public HGInventoryServiceConnector(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+
+                IConfig inventoryConfig = source.Configs["InventoryService"];
+                if (inventoryConfig == null)
+                {
+                    m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini");
+                    return;
+                }
+
+                m_log.Info("[HG INVENTORY SERVICE]: HG inventory service enabled");
+            }
+        }
+
+        private bool StringToUrlAndUserID(string id, out string url, out string userID)
+        {
+            url = String.Empty;
+            userID = String.Empty;
+
+            Uri assetUri;
+
+            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
+                    assetUri.Scheme == Uri.UriSchemeHttp)
+            {
+                url = "http://" + assetUri.Authority;
+                userID = assetUri.LocalPath.Trim(new char[] { '/' });
+                return true;
+            }
+
+            return false;
+        }
+        private ISessionAuthInventoryService GetConnector(string url)
+        {
+            InventoryServicesConnector connector = null;
+            lock (m_connectors)
+            {
+                if (m_connectors.ContainsKey(url))
+                {
+                    connector = m_connectors[url];
+                }
+                else
+                {
+                    // We're instantiating this class explicitly, but this won't
+                    // work in general, because the remote grid may be running
+                    // an inventory server that has a different protocol.
+                    // Eventually we will want a piece of protocol asking
+                    // the remote server about its kind. Definitely cool thing to do!
+                    connector = new InventoryServicesConnector(url);
+                    m_connectors.Add(url, connector);
+                }
+            }
+            return connector;
+        }
+
+        public string Host
+        {
+            get { return string.Empty; }
+        }
+
+        public void GetUserInventory(string id, UUID sessionID, InventoryReceiptCallback callback)
+        {
+            m_log.Debug("[HGInventory]: GetUserInventory " + id);
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                connector.GetUserInventory(userID, sessionID, callback);
+            }
+
+        }
+
+        public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.AddFolder(userID, folder, sessionID);
+            }
+            return false;
+        }
+
+        public bool UpdateFolder(string id, InventoryFolderBase folder, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.UpdateFolder(userID, folder, sessionID);
+            }
+            return false;
+        }
+
+        public bool MoveFolder(string id, InventoryFolderBase folder, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.MoveFolder(userID, folder, sessionID);
+            }
+            return false;
+        }
+
+        public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.PurgeFolder(userID, folder, sessionID);
+            }
+            return false;
+        }
+
+        public bool AddItem(string id, InventoryItemBase item, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.AddItem(userID, item, sessionID);
+            }
+            return false;
+        }
+
+        public bool UpdateItem(string id, InventoryItemBase item, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.UpdateItem(userID, item, sessionID);
+            }
+            return false;
+        }
+
+        public bool DeleteItem(string id, InventoryItemBase item, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.UpdateItem(userID, item, sessionID);
+            }
+            return false;
+        }
+
+        public InventoryItemBase QueryItem(string id, InventoryItemBase item, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.QueryItem(userID, item, sessionID);
+            }
+            return null;
+        }
+
+        public InventoryFolderBase QueryFolder(string id, InventoryFolderBase folder, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.QueryFolder(userID, folder, sessionID);
+            }
+            return null;
+        }
+
+    }
+}
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
index e9375f5..0243f1f 100644
--- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
@@ -1,125 +1,125 @@
-/*

- * 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;

-using System.Collections.Generic;

-using System.IO;

-using System.Reflection;

-using Nini.Config;

-using OpenSim.Framework;

-using OpenSim.Framework.Communications;

-using OpenSim.Framework.Servers.HttpServer;

-using OpenSim.Services.Interfaces;

-using OpenMetaverse;

-using Nwc.XmlRpc;

-

-namespace OpenSim.Services.Connectors

-{

-    public class LandServicesConnector : ILandService

-    {

-        private static readonly ILog m_log =

-                LogManager.GetLogger(

-                MethodBase.GetCurrentMethod().DeclaringType);

-

-        protected IGridServices m_MapService = null;

-

-        public LandServicesConnector()

-        {

-        }

-

-        public LandServicesConnector(IGridServices gridServices)

-        {

-            Initialise(gridServices);

-        }

-

-        public virtual void Initialise(IGridServices gridServices)

-        {

-            m_MapService = gridServices;

-        }

-

-        public virtual LandData GetLandData(ulong regionHandle, uint x, uint y)

-        {

-            LandData landData = null;

-            Hashtable hash = new Hashtable();

-            hash["region_handle"] = regionHandle.ToString();

-            hash["x"] = x.ToString();

-            hash["y"] = y.ToString();

-

-            IList paramList = new ArrayList();

-            paramList.Add(hash);

-

-            try

-            {

-                RegionInfo info = m_MapService.RequestNeighbourInfo(regionHandle);

-                if (info != null) // just to be sure

-                {

-                    XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);

-                    string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";

-                    XmlRpcResponse response = request.Send(uri, 10000);

-                    if (response.IsFault)

-                    {

-                        m_log.ErrorFormat("[LAND CONNECTOR] remote call returned an error: {0}", response.FaultString);

-                    }

-                    else

-                    {

-                        hash = (Hashtable)response.Value;

-                        try

-                        {

-                            landData = new LandData();

-                            landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]);

-                            landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]);

-                            landData.Area = Convert.ToInt32(hash["Area"]);

-                            landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]);

-                            landData.Description = (string)hash["Description"];

-                            landData.Flags = Convert.ToUInt32(hash["Flags"]);

-                            landData.GlobalID = new UUID((string)hash["GlobalID"]);

-                            landData.Name = (string)hash["Name"];

-                            landData.OwnerID = new UUID((string)hash["OwnerID"]);

-                            landData.SalePrice = Convert.ToInt32(hash["SalePrice"]);

-                            landData.SnapshotID = new UUID((string)hash["SnapshotID"]);

-                            landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);

-                            m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name);

-                        }

-                        catch (Exception e)

-                        {

-                            m_log.Error("[LAND CONNECTOR] Got exception while parsing land-data:", e);

-                        }

-                    }

-                }

-                else m_log.WarnFormat("[LAND CONNECTOR] Couldn't find region with handle {0}", regionHandle);

-            }

-            catch (Exception e)

-            {

-                m_log.ErrorFormat("[LAND CONNECTOR] Couldn't contact region {0}: {1}", regionHandle, e);

-            }

-        

-            return landData;

-        }

-    }

-}

+/*
+ * 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Services.Connectors
+{
+    public class LandServicesConnector : ILandService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected IGridServices m_MapService = null;
+
+        public LandServicesConnector()
+        {
+        }
+
+        public LandServicesConnector(IGridServices gridServices)
+        {
+            Initialise(gridServices);
+        }
+
+        public virtual void Initialise(IGridServices gridServices)
+        {
+            m_MapService = gridServices;
+        }
+
+        public virtual LandData GetLandData(ulong regionHandle, uint x, uint y)
+        {
+            LandData landData = null;
+            Hashtable hash = new Hashtable();
+            hash["region_handle"] = regionHandle.ToString();
+            hash["x"] = x.ToString();
+            hash["y"] = y.ToString();
+
+            IList paramList = new ArrayList();
+            paramList.Add(hash);
+
+            try
+            {
+                RegionInfo info = m_MapService.RequestNeighbourInfo(regionHandle);
+                if (info != null) // just to be sure
+                {
+                    XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
+                    string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
+                    XmlRpcResponse response = request.Send(uri, 10000);
+                    if (response.IsFault)
+                    {
+                        m_log.ErrorFormat("[LAND CONNECTOR] remote call returned an error: {0}", response.FaultString);
+                    }
+                    else
+                    {
+                        hash = (Hashtable)response.Value;
+                        try
+                        {
+                            landData = new LandData();
+                            landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]);
+                            landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]);
+                            landData.Area = Convert.ToInt32(hash["Area"]);
+                            landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]);
+                            landData.Description = (string)hash["Description"];
+                            landData.Flags = Convert.ToUInt32(hash["Flags"]);
+                            landData.GlobalID = new UUID((string)hash["GlobalID"]);
+                            landData.Name = (string)hash["Name"];
+                            landData.OwnerID = new UUID((string)hash["OwnerID"]);
+                            landData.SalePrice = Convert.ToInt32(hash["SalePrice"]);
+                            landData.SnapshotID = new UUID((string)hash["SnapshotID"]);
+                            landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
+                            m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error("[LAND CONNECTOR] Got exception while parsing land-data:", e);
+                        }
+                    }
+                }
+                else m_log.WarnFormat("[LAND CONNECTOR] Couldn't find region with handle {0}", regionHandle);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[LAND CONNECTOR] Couldn't contact region {0}: {1}", regionHandle, e);
+            }
+        
+            return landData;
+        }
+    }
+}