Merge master into teravuswork

author: teravus 2012-11-15 09:46:41 -0500
committer: teravus 2012-11-15 09:46:41 -0500
commit: dfac269032300872c4d0dc507f4f9062d102b0f4 (patch)
tree: d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Services
parent: * Fixes mesh loading issues in last commit. (diff)
parent: Merge branch 'master' into careminster (diff)
download: opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip
opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz
opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2
opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz
21 files changed, 464 insertions, 153 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 96b430d..f1bffa4 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.AssetService
                    if (assetLoaderEnabled)
                    {
-                        m_log.DebugFormat("[ASSET]: Loading default asset set from {0}", loaderArgs);
+                        m_log.DebugFormat("[ASSET SERVICE]: Loading default asset set from {0}", loaderArgs);
                        m_AssetLoader.ForEachDefaultXmlAsset(
                            loaderArgs,
@@ -200,20 +200,7 @@ namespace OpenSim.Services.AssetService
            if (!UUID.TryParse(id, out assetID))
                return false;
-            AssetBase asset = m_Database.GetAsset(assetID);
+            return m_Database.Delete(id);
-            if (asset == null)
-                return false;
-            if ((int)(asset.Flags & AssetFlags.Maptile) != 0)
-            {
-                return m_Database.Delete(id);
-            }
-            else
-            {
-                m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
-            }
-            return false;
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index 177c565..58ab052 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.AssetService
            m_Database = LoadPlugin<IAssetDataPlugin>(dllName);
            if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
+                throw new Exception(string.Format("Could not find a storage interface in the module {0}", dllName));
            m_Database.Initialise(connString);
@@ -96,7 +96,7 @@ namespace OpenSim.Services.AssetService
                m_AssetLoader = LoadPlugin<IAssetLoader>(loaderName);
                if (m_AssetLoader == null)
-                    throw new Exception("Asset loader could not be loaded");
+                    throw new Exception(string.Format("Asset loader could not be loaded from {0}", loaderName));
            }
        }
    }
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index e62bcb5..a1d10ed 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -194,21 +194,7 @@ namespace OpenSim.Services.AssetService
            if (!UUID.TryParse(id, out assetID))
                return false;
-            AssetBase asset = m_Database.GetAsset(assetID);
+            return m_Database.Delete(id);
-            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;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7f32ad3..4b502b7 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -52,6 +52,8 @@ namespace OpenSim.Services.Connectors
        private int m_retryCounter;
        private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
        private System.Timers.Timer m_retryTimer;
+        private int m_maxAssetRequestConcurrency = 30;
+        
        private delegate void AssetRetrievedEx(AssetBase asset);
        // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
@@ -80,6 +82,10 @@ namespace OpenSim.Services.Connectors
        public virtual void Initialise(IConfigSource source)
        {
+            IConfig netconfig = source.Configs["Network"];
+            if (netconfig != null)
+                m_maxAssetRequestConcurrency = netconfig.GetInt("MaxRequestConcurrency",m_maxAssetRequestConcurrency);
            IConfig assetConfig = source.Configs["AssetService"];
            if (assetConfig == null)
            {
@@ -204,7 +210,7 @@ namespace OpenSim.Services.Connectors
            if (asset == null || asset.Data == null || asset.Data.Length == 0)
            {
                asset = SynchronousRestObjectRequester.
-                        MakeRequest<int, AssetBase>("GET", uri, 0, 30);
+                        MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency);
                if (m_Cache != null)
                    m_Cache.Cache(asset);
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 6cd21d1..45f4514 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors.Friends
            return Call(region, sendData);
        }
-        public bool StatusNotify(GridRegion region, UUID userID, UUID friendID, bool online)
+        public bool StatusNotify(GridRegion region, UUID userID, string friendID, bool online)
        {
            Dictionary<string, object> sendData = new Dictionary<string, object>();
            //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
@@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Friends
            sendData["METHOD"] = "status";
            sendData["FromID"] = userID.ToString();
-            sendData["ToID"] = friendID.ToString();
+            sendData["ToID"] = friendID;
            sendData["Online"] = online.ToString();
            return Call(region, sendData);
@@ -154,7 +154,7 @@ namespace OpenSim.Services.Connectors.Friends
                if (!region.ServerURI.EndsWith("/"))
                    path = "/" + path;
                string uri = region.ServerURI + path;
-                m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
+                // m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
                try
                {
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index 20d7eaf..94bda82 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors
                    if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
                    {
                        if (replyData["result"] is Dictionary<string, object>)
-                            guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
+                            guinfo = Create((Dictionary<string, object>)replyData["result"]);
                    }
                    return guinfo;
@@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors
                {
                    if (griduser is Dictionary<string, object>)
                    {
-                        GridUserInfo pinfo = new GridUserInfo((Dictionary<string, object>)griduser);
+                        GridUserInfo pinfo = Create((Dictionary<string, object>)griduser);
                        rinfos.Add(pinfo);
                    }
                    else
@@ -286,5 +286,10 @@ namespace OpenSim.Services.Connectors
            return rinfos.ToArray();
        }
+        protected virtual GridUserInfo Create(Dictionary<string, object> griduser)
+        {
+            return new GridUserInfo(griduser);
+        }
    }
 }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 0e4d794..20eaa3a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 //                m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking");
            Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0);
-            Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0);
+            Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
            OSDMap extraData = new OSDMap
            {
@@ -297,7 +297,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
            List<GridRegion> foundRegions = new List<GridRegion>();
            Vector3d minPosition = new Vector3d(xmin, ymin, 0.0);
-            Vector3d maxPosition = new Vector3d(xmax, ymax, 4096.0);
+            Vector3d maxPosition = new Vector3d(xmax, ymax, Constants.RegionHeight);
            NameValueCollection requestArgs = new NameValueCollection
            {
@@ -395,8 +395,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
            if (response["Success"].AsBoolean())
            {
                OSDMap extraData = response["ExtraData"] as OSDMap;
-                int enabled = response["Enabled"].AsBoolean() ? (int) OpenSim.Data.RegionFlags.RegionOnline : 0;
+                int enabled = response["Enabled"].AsBoolean() ? (int)OpenSim.Framework.RegionFlags.RegionOnline : 0;
-                int hypergrid = extraData["HyperGrid"].AsBoolean() ? (int) OpenSim.Data.RegionFlags.Hyperlink : 0;
+                int hypergrid = extraData["HyperGrid"].AsBoolean() ? (int)OpenSim.Framework.RegionFlags.Hyperlink : 0;
                int flags =  enabled | hypergrid;
                m_log.DebugFormat("[SGGC] enabled - {0} hg - {1} flags - {2}", enabled, hypergrid, flags);
                return flags;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index aab403a..ee3b858 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -137,20 +137,25 @@ namespace OpenSim.Services.GridService
            if (regionInfos.RegionID == UUID.Zero)
                return "Invalid RegionID - cannot be zero UUID";
-            // This needs better sanity testing. What if regionInfo is registering in
-            // overlapping coords?
            RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+            if ((region != null) && (region.RegionID != regionInfos.RegionID))
+            {
+                m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
+                    regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+                return "Region overlaps another region";
+            }
            if (region != null)
            {
                // There is a preexisting record
                //
                // Get it's flags
                //
-                OpenSim.Data.RegionFlags rflags = (OpenSim.Data.RegionFlags)Convert.ToInt32(region.Data["flags"]);
+                OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(region.Data["flags"]);
                // Is this a reservation?
                //
-                if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0)
+                if ((rflags & OpenSim.Framework.RegionFlags.Reservation) != 0)
                {
                    // Regions reserved for the null key cannot be taken.
                    if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
@@ -161,10 +166,10 @@ namespace OpenSim.Services.GridService
                    // NOTE: Fudging the flags value here, so these flags
                    //       should not be used elsewhere. Don't optimize
                    //       this with the later retrieval of the same flags!
-                    rflags |= OpenSim.Data.RegionFlags.Authenticate;
+                    rflags |= OpenSim.Framework.RegionFlags.Authenticate;
                }
-                if ((rflags & OpenSim.Data.RegionFlags.Authenticate) != 0)
+                if ((rflags & OpenSim.Framework.RegionFlags.Authenticate) != 0)
                {
                    // Can we authenticate at all?
                    //
@@ -176,19 +181,36 @@ namespace OpenSim.Services.GridService
                }
            }
-            if ((region != null) && (region.RegionID != regionInfos.RegionID))
+            // If we get here, the destination is clear. Now for the real check.
+            if (!m_AllowDuplicateNames)
            {
-                m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
+                List<RegionData> dupe = m_Database.Get(regionInfos.RegionName, scopeID);
-                    regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+                if (dupe != null && dupe.Count > 0)
-                return "Region overlaps another region";
+                {
+                    foreach (RegionData d in dupe)
+                    {
+                        if (d.RegionID != regionInfos.RegionID)
+                        {
+                            m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.", 
+                                regionInfos.RegionName, regionInfos.RegionID);
+                            return "Duplicate region name";
+                        }
+                    }
+                }
            }
+            // If there is an old record for us, delete it if it is elsewhere.
+            region = m_Database.Get(regionInfos.RegionID, scopeID);
            if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
                ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
            {
-                if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Data.RegionFlags.NoMove) != 0)
+                if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.NoMove) != 0)
                    return "Can't move this region";
+                if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.LockedOut) != 0)
+                    return "Region locked out";
                // Region reregistering in other coordinates. Delete the old entry
                m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) was previously registered at {2}-{3}. Deleting old entry.",
                    regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
@@ -203,23 +225,6 @@ namespace OpenSim.Services.GridService
                }
            }
-            if (!m_AllowDuplicateNames)
-            {
-                List<RegionData> dupe = m_Database.Get(regionInfos.RegionName, scopeID);
-                if (dupe != null && dupe.Count > 0)
-                {
-                    foreach (RegionData d in dupe)
-                    {
-                        if (d.RegionID != regionInfos.RegionID)
-                        {
-                            m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.", 
-                                regionInfos.RegionName, regionInfos.RegionID);
-                            return "Duplicate region name";
-                        }
-                    }
-                }
-            }
            // Everything is ok, let's register
            RegionData rdata = RegionInfo2RegionData(regionInfos);
            rdata.ScopeID = scopeID;
@@ -227,10 +232,8 @@ namespace OpenSim.Services.GridService
            if (region != null)
            {
                int oldFlags = Convert.ToInt32(region.Data["flags"]);
-                if ((oldFlags & (int)OpenSim.Data.RegionFlags.LockedOut) != 0)
-                    return "Region locked out";
-                oldFlags &= ~(int)OpenSim.Data.RegionFlags.Reservation;
+                oldFlags &= ~(int)OpenSim.Framework.RegionFlags.Reservation;
                rdata.Data["flags"] = oldFlags.ToString(); // Preserve flags
            }
@@ -249,7 +252,7 @@ namespace OpenSim.Services.GridService
            }
            int flags = Convert.ToInt32(rdata.Data["flags"]);
-            flags |= (int)OpenSim.Data.RegionFlags.RegionOnline;
+            flags |= (int)OpenSim.Framework.RegionFlags.RegionOnline;
            rdata.Data["flags"] = flags.ToString();
            try
@@ -280,9 +283,9 @@ namespace OpenSim.Services.GridService
            int flags = Convert.ToInt32(region.Data["flags"]);
-            if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
+            if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Framework.RegionFlags.Persistent) != 0)
            {
-                flags &= ~(int)OpenSim.Data.RegionFlags.RegionOnline;
+                flags &= ~(int)OpenSim.Framework.RegionFlags.RegionOnline;
                region.Data["flags"] = flags.ToString();
                region.Data["last_seen"] = Util.UnixTimeSinceEpoch();
                try
@@ -317,7 +320,7 @@ namespace OpenSim.Services.GridService
                    if (rdata.RegionID != regionID)
                    {
                        int flags = Convert.ToInt32(rdata.Data["flags"]);
-                        if ((flags & (int)Data.RegionFlags.Hyperlink) == 0) // no hyperlinks as neighbours
+                        if ((flags & (int)Framework.RegionFlags.Hyperlink) == 0) // no hyperlinks as neighbours
                            rinfos.Add(RegionData2RegionInfo(rdata));
                    }
                }
@@ -467,7 +470,7 @@ namespace OpenSim.Services.GridService
            foreach (RegionData r in regions)
            {
-                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)
+                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.RegionOnline) != 0)
                    ret.Add(RegionData2RegionInfo(r));
            }
@@ -483,7 +486,7 @@ namespace OpenSim.Services.GridService
            foreach (RegionData r in regions)
            {
-                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)
+                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.RegionOnline) != 0)
                    ret.Add(RegionData2RegionInfo(r));
            }
@@ -499,7 +502,7 @@ namespace OpenSim.Services.GridService
            foreach (RegionData r in regions)
            {
-                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)
+                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.RegionOnline) != 0)
                    ret.Add(RegionData2RegionInfo(r));
            }
@@ -626,7 +629,7 @@ namespace OpenSim.Services.GridService
        private void OutputRegionToConsole(RegionData r)
        {
-            OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]);
+            OpenSim.Framework.RegionFlags flags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(r.Data["flags"]);
            ConsoleDisplayList dispList = new ConsoleDisplayList();
            dispList.AddRow("Region Name", r.RegionName);
@@ -656,7 +659,7 @@ namespace OpenSim.Services.GridService
            foreach (RegionData r in regions)
            {
-                OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]);
+                OpenSim.Framework.RegionFlags flags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(r.Data["flags"]);
                dispTable.AddRow(
                    r.RegionName,
                    r.RegionID.ToString(),
@@ -670,7 +673,7 @@ namespace OpenSim.Services.GridService
        private int ParseFlags(int prev, string flags)
        {
-            OpenSim.Data.RegionFlags f = (OpenSim.Data.RegionFlags)prev;
+            OpenSim.Framework.RegionFlags f = (OpenSim.Framework.RegionFlags)prev;
            string[] parts = flags.Split(new char[] {',', ' '}, StringSplitOptions.RemoveEmptyEntries);
@@ -682,18 +685,18 @@ namespace OpenSim.Services.GridService
                {
                    if (p.StartsWith("+"))
                    {
-                        val = (int)Enum.Parse(typeof(OpenSim.Data.RegionFlags), p.Substring(1));
+                        val = (int)Enum.Parse(typeof(OpenSim.Framework.RegionFlags), p.Substring(1));
-                        f |= (OpenSim.Data.RegionFlags)val;
+                        f |= (OpenSim.Framework.RegionFlags)val;
                    }
                    else if (p.StartsWith("-"))
                    {
-                        val = (int)Enum.Parse(typeof(OpenSim.Data.RegionFlags), p.Substring(1));
+                        val = (int)Enum.Parse(typeof(OpenSim.Framework.RegionFlags), p.Substring(1));
-                        f &= ~(OpenSim.Data.RegionFlags)val;
+                        f &= ~(OpenSim.Framework.RegionFlags)val;
                    }
                    else
                    {
-                        val = (int)Enum.Parse(typeof(OpenSim.Data.RegionFlags), p);
+                        val = (int)Enum.Parse(typeof(OpenSim.Framework.RegionFlags), p);
-                        f |= (OpenSim.Data.RegionFlags)val;
+                        f |= (OpenSim.Framework.RegionFlags)val;
                    }
                }
                catch (Exception)
@@ -725,7 +728,7 @@ namespace OpenSim.Services.GridService
                int flags = Convert.ToInt32(r.Data["flags"]);
                flags = ParseFlags(flags, cmd[4]);
                r.Data["flags"] = flags.ToString();
-                OpenSim.Data.RegionFlags f = (OpenSim.Data.RegionFlags)flags;
+                OpenSim.Framework.RegionFlags f = (OpenSim.Framework.RegionFlags)flags;
                MainConsole.Instance.Output(String.Format("Set region {0} to {1}", r.RegionName, f));
                m_Database.Store(r);
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 78eab3d..743d089 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -390,8 +390,8 @@ namespace OpenSim.Services.GridService
            List<RegionData> regions = m_Database.Get(mapName, m_ScopeID);
            if (regions != null && regions.Count > 0)
            {
-                OpenSim.Data.RegionFlags rflags = (OpenSim.Data.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);
+                OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);
-                if ((rflags & OpenSim.Data.RegionFlags.Hyperlink) != 0)
+                if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0)
                {
                    regInfo = new GridRegion(); 
                    regInfo.RegionID = regions[0].RegionID;
@@ -460,7 +460,7 @@ namespace OpenSim.Services.GridService
        private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
        {
            RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo);
-            int flags = (int)OpenSim.Data.RegionFlags.Hyperlink + (int)OpenSim.Data.RegionFlags.NoDirectLogin + (int)OpenSim.Data.RegionFlags.RegionOnline;
+            int flags = (int)OpenSim.Framework.RegionFlags.Hyperlink + (int)OpenSim.Framework.RegionFlags.NoDirectLogin + (int)OpenSim.Framework.RegionFlags.RegionOnline;
            rdata.Data["flags"] = flags.ToString();
            m_Database.Store(rdata);
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 47d22b9..004311f 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -57,10 +57,13 @@ namespace OpenSim.Services.HypergridService
        private static IUserAccountService m_UserAccountService;
        private static IUserAgentService m_UserAgentService;
        private static ISimulationService m_SimulationService;
+        private static IGridUserService m_GridUserService;
-        protected string m_AllowedClients = string.Empty;
+        private static string m_AllowedClients = string.Empty;
-        protected string m_DeniedClients = string.Empty;
+        private static string m_DeniedClients = string.Empty;
        private static bool m_ForeignAgentsAllowed = true;
+        private static List<string> m_ForeignsAllowedExceptions = new List<string>();
+        private static List<string> m_ForeignsDisallowedExceptions = new List<string>();
        private static UUID m_ScopeID;
        private static bool m_AllowTeleportsToAnyRegion;
@@ -82,8 +85,9 @@ namespace OpenSim.Services.HypergridService
                string gridService = serverConfig.GetString("GridService", String.Empty);
                string presenceService = serverConfig.GetString("PresenceService", String.Empty);
                string simulationService = serverConfig.GetString("SimulationService", String.Empty);
+                string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
-                // These 3 are mandatory, the others aren't
+                // These are mandatory, the others aren't
                if (gridService == string.Empty || presenceService == string.Empty)
                    throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
                
@@ -103,6 +107,8 @@ namespace OpenSim.Services.HypergridService
                    m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
                if (homeUsersService != string.Empty)
                    m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
+                if (gridUserService != string.Empty)
+                    m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
                if (simService != null)
                    m_SimulationService = simService;
@@ -113,6 +119,9 @@ namespace OpenSim.Services.HypergridService
                m_DeniedClients = serverConfig.GetString("DeniedClients", string.Empty);
                m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true);
+                LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions);
+                LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_ForeignsDisallowedExceptions);
                if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
                    throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
@@ -125,6 +134,15 @@ namespace OpenSim.Services.HypergridService
        {
        }
+        protected void LoadDomainExceptionsFromConfig(IConfig config, string variable, List<string> exceptions)
+        {
+            string value = config.GetString(variable, string.Empty);
+            string[] parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (string s in parts)
+                exceptions.Add(s.Trim());
+        }
        public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason)
        {
            regionID = UUID.Zero;
@@ -260,17 +278,26 @@ namespace OpenSim.Services.HypergridService
            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is ok");
            //
-            // Foreign agents allowed
+            // Foreign agents allowed? Exceptions?
            //
-            if (account == null && !m_ForeignAgentsAllowed)
+            if (account == null) 
            {
-                reason = "Unauthorized";
+                bool allowed = m_ForeignAgentsAllowed;
-                m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agents are not permitted {0} {1}. Refusing service.",
-                    aCircuit.firstname, aCircuit.lastname);
+                if (m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsAllowedExceptions))
-                return false;
+                        allowed = false;
-            }
-            // May want to authorize
+                if (!m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsDisallowedExceptions))
+                    allowed = true;
+                if (!allowed)
+                {
+                    reason = "Destination does not allow visitors from your world";
+                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agents are not permitted {0} {1} @ {2}. Refusing service.",
+                        aCircuit.firstname, aCircuit.lastname, aCircuit.ServiceURLs["HomeURI"]);
+                    return false;
+                }
+            }
            bool isFirstLogin = false;
            //
@@ -280,7 +307,8 @@ namespace OpenSim.Services.HypergridService
            if (presence != null) // it has been placed there by the login service
                isFirstLogin = true;
-            else 
+            else
+            {
                if (!m_PresenceService.LoginAgent(aCircuit.AgentID.ToString(), aCircuit.SessionID, aCircuit.SecureSessionID))
                {
                    reason = "Unable to login presence";
@@ -290,6 +318,26 @@ namespace OpenSim.Services.HypergridService
                }
                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok");
+                // Also login foreigners with GridUser service
+                if (m_GridUserService != null && account == null)
+                {
+                    string userId = aCircuit.AgentID.ToString();
+                    string first = aCircuit.firstname, last = aCircuit.lastname;
+                    if (last.StartsWith("@"))
+                    {
+                        string[] parts = aCircuit.firstname.Split('.');
+                        if (parts.Length >= 2)
+                        {
+                            first = parts[0];
+                            last = parts[1];
+                        }
+                    }
+                    userId += ";" + aCircuit.ServiceURLs["HomeURI"] + ";" + first + " " + last;
+                    m_GridUserService.LoggedIn(userId);
+                }
+            }
            //
            // Get the region
            //
@@ -393,6 +441,27 @@ namespace OpenSim.Services.HypergridService
        #region Misc
+        private bool IsException(AgentCircuitData aCircuit, List<string> exceptions)
+        {
+            bool exception = false;
+            if (exceptions.Count > 0) // we have exceptions
+            {
+                // Retrieve the visitor's origin
+                string userURL = aCircuit.ServiceURLs["HomeURI"].ToString();
+                if (!userURL.EndsWith("/"))
+                    userURL += "/";
+                if (exceptions.Find(delegate(string s)
+                {
+                    if (!s.EndsWith("/"))
+                        s += "/";
+                    return s == userURL;
+                }) != null)
+                    exception = true;
+            }
+            return exception;
+        }
        #endregion
    }
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index db98166..84dec8d 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -58,6 +58,8 @@ namespace OpenSim.Services.HypergridService
        private UserAccountCache m_Cache;
+        private AssetPermissions m_AssetPerms;
        public HGAssetService(IConfigSource config, string configName) : base(config, configName)
        {
            m_log.Debug("[HGAsset Service]: Starting");
@@ -80,6 +82,10 @@ namespace OpenSim.Services.HypergridService
            m_HomeURL = assetConfig.GetString("HomeURI", m_HomeURL);
            m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
+            // Permissions
+            m_AssetPerms = new AssetPermissions(assetConfig);
        }
        #region IAssetService overrides
@@ -90,6 +96,9 @@ namespace OpenSim.Services.HypergridService
            if (asset == null)
                return null;
+            if (!m_AssetPerms.AllowedExport(asset.Type))
+                return null;
            if (asset.Metadata.Type == (sbyte)AssetType.Object)
                asset.Data = AdjustIdentifiers(asset.Data); ;
@@ -112,16 +121,27 @@ namespace OpenSim.Services.HypergridService
        public override byte[] GetData(string id)
        {
-            byte[] data = base.GetData(id);
+            AssetBase asset = Get(id);
+            if (asset == null)
+                return null;
-            if (data == null)
+            if (!m_AssetPerms.AllowedExport(asset.Type))
                return null;
-            return AdjustIdentifiers(data);
+            return asset.Data;
        }
        //public virtual bool Get(string id, Object sender, AssetRetrieved handler)
+        public override string Store(AssetBase asset)
+        {
+            if (!m_AssetPerms.AllowedImport(asset.Type))
+                return string.Empty;
+            return base.Store(asset);
+        }
        public override bool Delete(string id)
        {
            // NOGO
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index 98423d7..a8bcfb2 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -397,7 +397,7 @@ namespace OpenSim.Services.HypergridService
                    if (region != null)
                    {
                        m_log.DebugFormat("[HGFRIENDS SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline"));
-                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online);
+                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online);
                    }
                }
            }
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 6e4b68c..784f136 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -56,10 +56,12 @@ namespace OpenSim.Services.HypergridService
        private string m_HomeURL;
        private IUserAccountService m_UserAccountService;
+        private IAvatarService m_AvatarService;
 //        private UserAccountCache m_Cache;
        private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
+        private ExpiringCache<UUID, AvatarAppearance> m_Appearances = new ExpiringCache<UUID, AvatarAppearance>();
        public HGSuitcaseInventoryService(IConfigSource config, string configName)
            : base(config, configName)
@@ -69,7 +71,7 @@ namespace OpenSim.Services.HypergridService
                m_ConfigName = configName;
            if (m_Database == null)
-                m_log.WarnFormat("[XXX]: m_Database is null!");
+                m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: m_Database is null!");
            //
            // Try reading the [InventoryService] section, if it exists
@@ -77,7 +79,6 @@ namespace OpenSim.Services.HypergridService
            IConfig invConfig = config.Configs[m_ConfigName];
            if (invConfig != null)
            {
-                // realm = authConfig.GetString("Realm", realm);
                string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
                if (userAccountsDll == string.Empty)
                    throw new Exception("Please specify UserAccountsService in HGInventoryService configuration");
@@ -87,8 +88,14 @@ namespace OpenSim.Services.HypergridService
                if (m_UserAccountService == null)
                    throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
-                // legacy configuration [obsolete]
+                string avatarDll = invConfig.GetString("AvatarService", string.Empty);
-                m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty);
+                if (avatarDll == string.Empty)
+                    throw new Exception("Please specify AvatarService in HGInventoryService configuration");
+                m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarDll, args);
+                if (m_AvatarService == null)
+                    throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
                // Preferred
                m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
@@ -294,7 +301,7 @@ namespace OpenSim.Services.HypergridService
        public override bool AddFolder(InventoryFolderBase folder)
        {
-            m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
+            //m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
            // Let's do a bit of sanity checking, more than the base service does
            // make sure the given folder's parent folder exists under the suitcase tree of this user
@@ -316,7 +323,7 @@ namespace OpenSim.Services.HypergridService
        public override bool UpdateFolder(InventoryFolderBase folder)
        {
-            m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
+            //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
            if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
            {
                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name);
@@ -394,7 +401,7 @@ namespace OpenSim.Services.HypergridService
                return null;
            }
-            if (!IsWithinSuitcaseTree(it.Owner, it.Folder))
+            if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID))
            {
                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Item {0} (folder {1}) is not within Suitcase",
                    it.Name, it.Folder);
@@ -453,6 +460,15 @@ namespace OpenSim.Services.HypergridService
            if (folders != null && folders.Length > 0)
                return folders[0];
+            // OK, so the RootFolder type didn't work. Let's look for any type with parent UUID.Zero.
+            folders = m_Database.GetFolders(
+                new string[] { "agentID", "folderName", "parentFolderID" },
+                new string[] { principalID.ToString(), "My Inventory", UUID.Zero.ToString() });
+            if (folders != null && folders.Length > 0)
+                return folders[0];
            return null;
        }
@@ -549,6 +565,52 @@ namespace OpenSim.Services.HypergridService
            else return true;
        }
        #endregion
+        #region Avatar Appearance
+        private AvatarAppearance GetAppearance(UUID principalID)
+        {
+            AvatarAppearance a = null;
+            if (m_Appearances.TryGetValue(principalID, out a))
+                return a;
+            a = m_AvatarService.GetAppearance(principalID);
+            m_Appearances.AddOrUpdate(principalID, a, 5 * 60); // 5minutes
+            return a;
+        }
+        private bool IsPartOfAppearance(UUID principalID, UUID itemID)
+        {
+            AvatarAppearance a = GetAppearance(principalID);
+            if (a == null)
+                return false;
+            // Check wearables (body parts and clothes)
+            for (int i = 0; i < a.Wearables.Length; i++)
+            {
+                for (int j = 0; j < a.Wearables[i].Count; j++)
+                {
+                    if (a.Wearables[i][j].ItemID == itemID)
+                    {
+                        //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); 
+                        return true;
+                    }
+                }
+            }
+            // Check attachments
+            if (a.GetAttachmentForItem(itemID) != null)
+            {
+                //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); 
+                return true;
+            }
+            return false;
+        }
+        #endregion
    }
 }
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index a49993c..416ad16 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -77,6 +77,10 @@ namespace OpenSim.Services.HypergridService
        protected static bool m_BypassClientVerification;
+        private static Dictionary<int, bool> m_ForeignTripsAllowed = new Dictionary<int, bool>();
+        private static Dictionary<int, List<string>> m_TripsAllowedExceptions = new Dictionary<int, List<string>>();
+        private static Dictionary<int, List<string>> m_TripsDisallowedExceptions = new Dictionary<int, List<string>>();
        public UserAgentService(IConfigSource config) : this(config, null)
        {
        }
@@ -121,6 +125,12 @@ namespace OpenSim.Services.HypergridService
                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
                m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args);
+                m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
+                LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed");
+                LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
+                LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions);
                m_GridName = serverConfig.GetString("ExternalName", string.Empty);
                if (m_GridName == string.Empty)
                {
@@ -130,10 +140,43 @@ namespace OpenSim.Services.HypergridService
                if (!m_GridName.EndsWith("/"))
                    m_GridName = m_GridName + "/";
-                m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
            }
        }
+        protected void LoadTripPermissionsFromConfig(IConfig config, string variable)
+        {
+            foreach (string keyName in config.GetKeys())
+            {
+                if (keyName.StartsWith(variable + "_Level_"))
+                {
+                    int level = 0;
+                    if (Int32.TryParse(keyName.Replace(variable + "_Level_", ""), out level))
+                        m_ForeignTripsAllowed.Add(level, config.GetBoolean(keyName, true));
+                }
+            }
+        }
+        protected void LoadDomainExceptionsFromConfig(IConfig config, string variable, Dictionary<int, List<string>> exceptions)
+        {
+            foreach (string keyName in config.GetKeys())
+            {
+                if (keyName.StartsWith(variable + "_Level_"))
+                {
+                    int level = 0;
+                    if (Int32.TryParse(keyName.Replace(variable + "_Level_", ""), out level) && !exceptions.ContainsKey(level))
+                    {
+                        exceptions.Add(level, new List<string>());
+                        string value = config.GetString(keyName, string.Empty);
+                        string[] parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                        foreach (string s in parts)
+                            exceptions[level].Add(s.Trim());
+                    }
+                }
+            }
+        }
        public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt)
        {
            position = new Vector3(128, 128, 0); lookAt = Vector3.UnitY;
@@ -166,13 +209,39 @@ namespace OpenSim.Services.HypergridService
            m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
                agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI);
-            if (m_UserAccountService.GetUserAccount(UUID.Zero, agentCircuit.AgentID) == null)
+            string gridName = gatekeeper.ServerURI;
+            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, agentCircuit.AgentID);
+            if (account == null)
            {
                m_log.WarnFormat("[USER AGENT SERVICE]: Someone attempted to lauch a foreign user from here {0} {1}", agentCircuit.firstname, agentCircuit.lastname);
                reason = "Forbidden to launch your agents from here";
                return false;
            }
+            // Is this user allowed to go there?
+            if (m_GridName != gridName)
+            {
+                if (m_ForeignTripsAllowed.ContainsKey(account.UserLevel))
+                {
+                    bool allowed = m_ForeignTripsAllowed[account.UserLevel];
+                    if (m_ForeignTripsAllowed[account.UserLevel] && IsException(gridName, account.UserLevel, m_TripsAllowedExceptions))
+                        allowed = false;
+                    if (!m_ForeignTripsAllowed[account.UserLevel] && IsException(gridName, account.UserLevel, m_TripsDisallowedExceptions))
+                        allowed = true;
+                    if (!allowed)
+                    {
+                        reason = "Your world does not allow you to visit the destination";
+                        m_log.InfoFormat("[USER AGENT SERVICE]: Agents not permitted to visit {0}. Refusing service.", gridName);
+                        return false;
+                    }
+                }
+            }
            // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
            GridRegion region = new GridRegion(gatekeeper);
            region.ServerURI = gatekeeper.ServerURI;
@@ -189,7 +258,6 @@ namespace OpenSim.Services.HypergridService
            
            bool success = false;
            string myExternalIP = string.Empty;
-            string gridName = gatekeeper.ServerURI;
            m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}", m_GridName, gridName);
@@ -434,7 +502,7 @@ namespace OpenSim.Services.HypergridService
                    if (region != null)
                    {
                        m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline"));
-                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online);
+                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online);
                    }
                }
            }
@@ -586,6 +654,35 @@ namespace OpenSim.Services.HypergridService
            else
                return UUID.Zero;
        }
+        #region Misc
+        private bool IsException(string dest, int level, Dictionary<int, List<string>> exceptions)
+        {
+            if (!exceptions.ContainsKey(level))
+                return false;
+            bool exception = false;
+            if (exceptions[level].Count > 0) // we have exceptions
+            {
+                string destination = dest;
+                if (!destination.EndsWith("/"))
+                    destination += "/";
+                if (exceptions[level].Find(delegate(string s)
+                {
+                    if (!s.EndsWith("/"))
+                        s += "/";
+                    return s == destination;
+                }) != null)
+                    exception = true;
+            }
+            return exception;
+        }
+        #endregion
    }
    class TravelingAgentInfo
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 80494f1..3c469c6 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -68,7 +68,11 @@ namespace OpenSim.Services.Interfaces
        /// </summary>
        /// <param name="id">The asset id</param>
        /// <param name="sender">Represents the requester.  Passed back via the handler</param>
-        /// <param name="handler">The handler to call back once the asset has been retrieved</param>
+        /// <param name="handler">
+        /// The handler to call back once the asset has been retrieved.  This will be called back with a null AssetBase
+        /// if the asset could not be found for some reason (e.g. if it does not exist, if a remote asset service
+        /// was not contactable, if it is not in the database, etc.).
+        /// </param>
        /// <returns>True if the id was parseable, false otherwise</returns>
        bool Get(string id, Object sender, AssetRetrieved handler);
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index cdcb961..3f4c958 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -100,6 +100,19 @@ namespace OpenSim.Services.Interfaces
        List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
        List<GridRegion> GetHyperlinks(UUID scopeID);
+        /// <summary>
+        /// Get internal OpenSimulator region flags.
+        /// </summary>
+        /// <remarks>
+        /// See OpenSimulator.Framework.RegionFlags.  These are not returned in the GridRegion structure -
+        /// they currently need to be requested separately.  Possibly this should change to avoid multiple service calls
+        /// in some situations.
+        /// </remarks>
+        /// <returns>
+        /// The region flags.
+        /// </returns>
+        /// <param name='scopeID'></param>
+        /// <param name='regionID'></param>
        int GetRegionFlags(UUID scopeID, UUID regionID);
    }
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 0a52bfa..2e7237e 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
        }
-        public Dictionary<string, object> ToKeyValuePairs()
+        public virtual Dictionary<string, object> ToKeyValuePairs()
        {
            Dictionary<string, object> result = new Dictionary<string, object>();
            result["UserID"] = UserID;
@@ -96,7 +96,6 @@ namespace OpenSim.Services.Interfaces
            result["Online"] = Online.ToString();
            result["Login"] = Login.ToString();
            result["Logout"] = Logout.ToString();
            
            return result;
        }
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index 8d583ff..90f9842 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -61,13 +61,49 @@ namespace OpenSim.Services.Interfaces
    public interface IPresenceService
    {
+        /// <summary>
+        /// Store session information.
+        /// </summary>
+        /// <returns>/returns>
+        /// <param name='userID'></param>
+        /// <param name='sessionID'></param>
+        /// <param name='secureSessionID'></param>
        bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID);
+        /// <summary>
+        /// Remove session information.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sessionID'></param>
        bool LogoutAgent(UUID sessionID);
+        /// <summary>
+        /// Remove session information for all agents in the given region.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='regionID'></param>
        bool LogoutRegionAgents(UUID regionID);
+        /// <summary>
+        /// Update data for an existing session.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sessionID'></param>
+        /// <param name='regionID'></param>
        bool ReportAgent(UUID sessionID, UUID regionID);
+        /// <summary>
+        /// Get session information for a given session ID.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sessionID'></param>
        PresenceInfo GetAgent(UUID sessionID);
+        /// <summary>
+        /// Get session information for a collection of users.
+        /// </summary>
+        /// <returns>Session information for the users.</returns>
+        /// <param name='userIDs'></param>
        PresenceInfo[] GetAgents(string[] userIDs);
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 7518b86..309dab4 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Services.InventoryService
            m_Database = LoadPlugin<IXInventoryData>(dllName,
                    new Object[] {connString, String.Empty});
            if (m_Database == null)
                throw new Exception("Could not find a storage interface in the given module");
        }
@@ -229,10 +230,28 @@ namespace OpenSim.Services.InventoryService
        public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
        {
 //            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
+            InventoryFolderBase rootFolder = GetRootFolder(principalID);
+            if (rootFolder == null)
+            {
+                m_log.WarnFormat(
+                    "[XINVENTORY]: Found no root folder for {0} in GetFolderForType() when looking for {1}",
+                    principalID, type);
+                return null;
+            }
+            
+            return GetSystemFolderForType(rootFolder, type);
+        }
+        private InventoryFolderBase GetSystemFolderForType(InventoryFolderBase rootFolder, AssetType type)
+        {
+//            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
            
            XInventoryFolder[] folders = m_Database.GetFolders(
-                    new string[] { "agentID", "type"},
+                    new string[] { "agentID", "parentFolderID", "type"},
-                    new string[] { principalID.ToString(), ((int)type).ToString() });
+                    new string[] { rootFolder.Owner.ToString(), rootFolder.ID.ToString(), ((int)type).ToString() });
            if (folders.Length == 0)
            {
@@ -308,22 +327,38 @@ namespace OpenSim.Services.InventoryService
            if (check != null)
                return false;
-            if (folder.Type == (short)AssetType.Folder
+            if (folder.Type != (short)AssetType.Folder && folder.Type != (short)AssetType.Unknown)
-                || folder.Type == (short)AssetType.Unknown
-                || folder.Type == (short)AssetType.OutfitFolder
-                || GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null)
            {
-                XInventoryFolder xFolder = ConvertFromOpenSim(folder);
+                InventoryFolderBase rootFolder = GetRootFolder(folder.Owner);
-                return m_Database.StoreFolder(xFolder);
-            }
+                if (rootFolder == null)
-            else
+                {
-            {
+                    m_log.WarnFormat(
-                m_log.WarnFormat(
+                        "[XINVENTORY]: Found no root folder for {0} in AddFolder() when looking for {1}",
-                    "[XINVENTORY]: Folder of type {0} already exists when tried to add {1} to {2} for {3}",
+                        folder.Owner, folder.Type);
-                    folder.Type, folder.Name, folder.ParentID, folder.Owner);
+                    return false;
+                }
+                // Check we're not trying to add this as a system folder.
+                if (folder.ParentID == rootFolder.ID)
+                {
+                    InventoryFolderBase existingSystemFolder
+                        = GetSystemFolderForType(rootFolder, (AssetType)folder.Type);
+                    if (existingSystemFolder != null)
+                    {
+                        m_log.WarnFormat(
+                            "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}",
+                            folder.Type, folder.Name, folder.ParentID, folder.Owner);
+    
+                        return false;
+                    }
+                }
            }
-            return false;
+            XInventoryFolder xFolder = ConvertFromOpenSim(folder);
+            return m_Database.StoreFolder(xFolder);
        }
        public virtual bool UpdateFolder(InventoryFolderBase folder)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 988a9b9..cbb6e6c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Services.LLLoginService
                {
                    m_log.InfoFormat(
                        "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}",
-                        firstName, lastName, m_MinLoginLevel, account.UserLevel);
+                        firstName, lastName, account.UserLevel, m_MinLoginLevel);
                    return LLFailedLoginResponse.LoginBlockedProblem;
                }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index ac3d8fd..43fa04b 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserAccountService
            m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
        }
-        public GridUserInfo GetGridUserInfo(string userID)
+        public virtual GridUserInfo GetGridUserInfo(string userID)
        {
            GridUserData d = m_Database.Get(userID);
@@ -122,17 +122,6 @@ namespace OpenSim.Services.UserAccountService
            return m_Database.Store(d);
        }
-        protected bool StoreGridUserInfo(GridUserInfo info)
-        {
-            GridUserData d = new GridUserData();
-            d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
-            d.Data["HomePosition"] = info.HomePosition.ToString();
-            d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
-            return m_Database.Store(d);
-        }
        public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
        {
            GridUserData d = m_Database.Get(userID);
author	teravus	2012-11-15 09:46:41 -0500
committer	teravus	2012-11-15 09:46:41 -0500
commit	dfac269032300872c4d0dc507f4f9062d102b0f4 (patch)
tree	d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Services
parent	* Fixes mesh loading issues in last commit. (diff)
parent	Merge branch 'master' into careminster (diff)
download	opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz