2 files changed, 216 insertions, 2 deletions

diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
new file mode 100644
index 0000000..d161c58
--- /dev/null
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -0,0 +1,213 @@
+/*
+ * 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 System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+
+namespace OpenSim.Services.AssetService
+{
+    /// <summary>
+    /// This will be developed into a de-duplicating asset service.
+    /// XXX: Currently it's a just a copy of the existing AssetService. so please don't attempt to use it.
+    /// </summary>
+    public class XAssetService : AssetServiceBase, IAssetService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected static XAssetService m_RootInstance;
+
+        public XAssetService(IConfigSource config) : base(config)
+        {
+            if (m_RootInstance == null)
+            {
+                m_RootInstance = this;
+
+                if (m_AssetLoader != null)
+                {
+                    IConfig assetConfig = config.Configs["AssetService"];
+                    if (assetConfig == null)
+                        throw new Exception("No AssetService configuration");
+
+                    string loaderArgs = assetConfig.GetString("AssetLoaderArgs",
+                            String.Empty);
+
+                    bool assetLoaderEnabled = assetConfig.GetBoolean("AssetLoaderEnabled", true);
+
+                    if (assetLoaderEnabled)
+                    {
+                        m_log.DebugFormat("[XASSET SERVICE]: Loading default asset set from {0}", loaderArgs);
+
+                        m_AssetLoader.ForEachDefaultXmlAsset(
+                            loaderArgs,
+                            delegate(AssetBase a)
+                            {
+                                AssetBase existingAsset = Get(a.ID);
+//                                AssetMetadata existingMetadata = GetMetadata(a.ID);
+
+                                if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
+                                {
+//                                    m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
+                                    Store(a);
+                                }
+                            });
+                    }
+
+                    m_log.Debug("[XASSET SERVICE]: Local asset service enabled");
+                }
+            }
+        }
+
+        public virtual AssetBase Get(string id)
+        {
+//            m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id);
+            
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+            {
+                m_log.WarnFormat("[XASSET SERVICE]: Could not parse requested asset id {0}", id);
+                return null;
+            }
+
+            try
+            {
+                return m_Database.GetAsset(assetID);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[XASSET SERVICE]: Exception getting asset {0} {1}", assetID, e);
+                return null;
+            }
+        }
+
+        public virtual AssetBase GetCached(string id)
+        {
+            return Get(id);
+        }
+
+        public virtual AssetMetadata GetMetadata(string id)
+        {
+//            m_log.DebugFormat("[XASSET SERVICE]: Get asset metadata for {0}", id);
+            
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+                return null;
+
+            AssetBase asset = m_Database.GetAsset(assetID);
+            if (asset != null)
+                return asset.Metadata;
+
+            return null;
+        }
+
+        public virtual byte[] GetData(string id)
+        {
+//            m_log.DebugFormat("[XASSET SERVICE]: Get asset data for {0}", id);
+
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+                return null;
+
+            AssetBase asset = m_Database.GetAsset(assetID);
+            return asset.Data;
+        }
+
+        public virtual bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id);
+            
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+                return false;
+
+            AssetBase asset = m_Database.GetAsset(assetID);
+
+            //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset);
+            
+            handler(id, sender, asset);
+
+            return true;
+        }
+
+        public virtual string Store(AssetBase asset)
+        {
+            if (!m_Database.ExistsAsset(asset.FullID))
+            {
+//                m_log.DebugFormat(
+//                    "[XASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length);
+                m_Database.StoreAsset(asset);
+            }
+//            else
+//            {
+//                m_log.DebugFormat(
+//                    "[XASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length);
+//            }
+
+            return asset.ID;
+        }
+
+        public bool UpdateContent(string id, byte[] data)
+        {
+            return false;
+        }
+
+        public virtual bool Delete(string id)
+        {
+            m_log.DebugFormat("[XASSET SERVICE]: Deleting asset {0}", id);
+            UUID assetID;
+            if (!UUID.TryParse(id, out assetID))
+                return false;
+
+            AssetBase asset = m_Database.GetAsset(assetID);
+            if (asset == null)
+                return false;
+
+            if ((int)(asset.Flags & AssetFlags.Maptile) != 0)
+            {
+                return m_Database.Delete(id);
+            }
+            else
+            {
+                m_log.DebugFormat("[XASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
+            }
+
+            return false;
+        }
+    }
+}
+
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 0a59f86..4e38687 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -296,9 +296,10 @@ namespace OpenSim.Services.HypergridService
                 aCircuit.firstname = account.FirstName;
                 aCircuit.lastname = account.LastName;
             }
-            if (account == null && !aCircuit.lastname.StartsWith("@"))
+            if (account == null)
             {
-                aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
+                if (!aCircuit.lastname.StartsWith("@"))
+                    aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
                 try
                 {
                     Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString());