From c0beeb929e22509329781cdf85f7a5d90c4b0e36 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 12 Oct 2009 17:00:01 -0700
Subject: * Fixes http://opensimulator.org/mantis/view.php?id=4225 * Fixes
 http://opensimulator.org/mantis/view.php?id=3959 * Allows for viewing
 inventory textures outside home grid

---
 OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 1004fb9..9878855 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -299,6 +299,7 @@ namespace OpenSim.Services.Connectors.Inventory
 
             if (StringToUrlAndUserID(id, out url, out userID))
             {
+                //m_log.DebugFormat("[HGInventory CONNECTOR]: calling {0}", url);
                 ISessionAuthInventoryService connector = GetConnector(url);
                 return connector.QueryItem(userID, item, sessionID);
             }
-- 
cgit v1.1


From db4cdc09614abc1c35a242f4c882b2e3285f0206 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 14 Oct 2009 04:18:59 +0100
Subject: Set the estate owner to be the master avatar if it's not set.

---
 OpenSim/Services/Interfaces/IGridService.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 14560b1..e69e4cd 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -200,6 +200,12 @@ namespace OpenSim.Services.Interfaces
             Maturity = ConvertFrom.RegionSettings.Maturity;
             RegionSecret = ConvertFrom.regionSecret;
             EstateOwner = ConvertFrom.EstateSettings.EstateOwner;
+            if (EstateOwner == UUID.Zero)
+            {
+                EstateOwner = ConvertFrom.MasterAvatarAssignedUUID;
+                ConvertFrom.EstateSettings.EstateOwner = EstateOwner;
+                ConvertFrom.EstateSettings.Save();
+            }
         }
 
         public GridRegion(GridRegion ConvertFrom)
-- 
cgit v1.1