From 22a3ad7f6c5f54e326ac02483a9540fddaeb7506 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 11:26:12 -0800
Subject: * Bug fix in XInventoryData -- groupOwned is an int in the DB * Bug
 fix in InventoryServerInConnector -- m_config

---
 OpenSim/Data/IXInventoryData.cs                                |  2 +-
 .../Server/Handlers/Inventory/InventoryServerInConnector.cs    |  4 +++-
 OpenSim/Services/InventoryService/XInventoryService.cs         | 10 ++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
index cd9273e..6909136 100644
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data
         public int saleType;
         public int creationDate;
         public UUID groupID;
-        public bool groupOwned;
+        public int groupOwned;
         public int flags;
         public UUID inventoryID;
         public UUID avatarID;
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 53db739..1d422a7 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -59,7 +59,9 @@ namespace OpenSim.Server.Handlers.Inventory
         public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
-            m_ConfigName = configName;
+            if (configName != string.Empty)
+                m_ConfigName = configName;
+    
             IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 2fb6a56..68a4d7f 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -468,7 +468,10 @@ namespace OpenSim.Services.InventoryService
             newItem.EveryOnePermissions = (uint)item.inventoryEveryOnePermissions;
             newItem.GroupPermissions = (uint)item.inventoryGroupPermissions;
             newItem.GroupID = item.groupID;
-            newItem.GroupOwned = item.groupOwned;
+            if (item.groupOwned == 0)
+                newItem.GroupOwned = false;
+            else
+                newItem.GroupOwned = true;
             newItem.SalePrice = item.salePrice;
             newItem.SaleType = (byte)item.saleType;
             newItem.Flags = (uint)item.flags;
@@ -496,7 +499,10 @@ namespace OpenSim.Services.InventoryService
             newItem.inventoryEveryOnePermissions = (int)item.EveryOnePermissions;
             newItem.inventoryGroupPermissions = (int)item.GroupPermissions;
             newItem.groupID = item.GroupID;
-            newItem.groupOwned = item.GroupOwned;
+            if (item.GroupOwned)
+                newItem.groupOwned = 1;
+            else
+                newItem.groupOwned = 0;
             newItem.salePrice = item.SalePrice;
             newItem.saleType = (int)item.SaleType;
             newItem.flags = (int)item.Flags;
-- 
cgit v1.1