OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Bug fix in XInventoryData -- groupOwned is an int in the DB 

* Bug fix in InventoryServerInConnector -- m_config
slimupdates
Diva Canto 2010-01-31 11:26:12 -08:00
parent 40d8e91008
commit 22a3ad7f6c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/IXInventoryData.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Data
public int saleType; public int saleType;
public int creationDate; public int creationDate;
public UUID groupID; public UUID groupID;
public bool groupOwned; public int groupOwned;
public int flags; public int flags;
public UUID inventoryID; public UUID inventoryID;
public UUID avatarID; public UUID avatarID;

4
OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
View File

@ -59,7 +59,9 @@ namespace OpenSim.Server.Handlers.Inventory
public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) : public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
base(config, server, configName) base(config, server, configName)
{ {
m_ConfigName = configName; if (configName != string.Empty)
m_ConfigName = configName;
IConfig serverConfig = config.Configs[m_ConfigName]; IConfig serverConfig = config.Configs[m_ConfigName];
if (serverConfig == null) if (serverConfig == null)
throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));

10
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -468,7 +468,10 @@ namespace OpenSim.Services.InventoryService
newItem.EveryOnePermissions = (uint)item.inventoryEveryOnePermissions; newItem.EveryOnePermissions = (uint)item.inventoryEveryOnePermissions;
newItem.GroupPermissions = (uint)item.inventoryGroupPermissions; newItem.GroupPermissions = (uint)item.inventoryGroupPermissions;
newItem.GroupID = item.groupID; newItem.GroupID = item.groupID;
newItem.GroupOwned = item.groupOwned; if (item.groupOwned == 0)
newItem.GroupOwned = false;
else
newItem.GroupOwned = true;
newItem.SalePrice = item.salePrice; newItem.SalePrice = item.salePrice;
newItem.SaleType = (byte)item.saleType; newItem.SaleType = (byte)item.saleType;
newItem.Flags = (uint)item.flags; newItem.Flags = (uint)item.flags;
@ -496,7 +499,10 @@ namespace OpenSim.Services.InventoryService
newItem.inventoryEveryOnePermissions = (int)item.EveryOnePermissions; newItem.inventoryEveryOnePermissions = (int)item.EveryOnePermissions;
newItem.inventoryGroupPermissions = (int)item.GroupPermissions; newItem.inventoryGroupPermissions = (int)item.GroupPermissions;
newItem.groupID = item.GroupID; newItem.groupID = item.GroupID;
newItem.groupOwned = item.GroupOwned; if (item.GroupOwned)
newItem.groupOwned = 1;
else
newItem.groupOwned = 0;
newItem.salePrice = item.SalePrice; newItem.salePrice = item.SalePrice;
newItem.saleType = (int)item.SaleType; newItem.saleType = (int)item.SaleType;
newItem.flags = (int)item.Flags; newItem.flags = (int)item.Flags;