aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/Resources/os_groups_Store.migrations2
-rw-r--r--OpenSim/Tests/Permissions/Common.cs9
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
index 1a49900..6ec8914 100644
--- a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
@@ -18,7 +18,7 @@ CREATE TABLE `os_groups_groups` (
18 PRIMARY KEY (`GroupID`), 18 PRIMARY KEY (`GroupID`),
19 UNIQUE KEY `Name` (`Name`), 19 UNIQUE KEY `Name` (`Name`),
20 FULLTEXT KEY `Name_2` (`Name`) 20 FULLTEXT KEY `Name_2` (`Name`)
21) ENGINE=InnoDB; 21) ENGINE=MyISAM;
22 22
23 23
24CREATE TABLE `os_groups_membership` ( 24CREATE TABLE `os_groups_membership` (
diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index f93c120..4ecce38 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -72,12 +72,21 @@ namespace OpenSim.Tests.Permissions
72 IConfigSource config = new IniConfigSource(); 72 IConfigSource config = new IniConfigSource();
73 config.AddConfig("Messaging"); 73 config.AddConfig("Messaging");
74 config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule"); 74 config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
75
75 config.AddConfig("Modules"); 76 config.AddConfig("Modules");
76 config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule"); 77 config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
78
77 config.AddConfig("InventoryService"); 79 config.AddConfig("InventoryService");
78 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:XInventoryService"); 80 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:XInventoryService");
79 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll:TestXInventoryDataPlugin"); 81 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll:TestXInventoryDataPlugin");
80 82
83 config.AddConfig("Groups");
84 config.Configs["Groups"].Set("Enabled", "true");
85 config.Configs["Groups"].Set("Module", "Groups Module V2");
86 config.Configs["Groups"].Set("StorageProvider", "OpenSim.Tests.Common.dll:TestGroupsDataPlugin");
87 config.Configs["Groups"].Set("ServicesConnectorModule", "Groups Local Service Connector");
88 config.Configs["Groups"].Set("LocalService", "local");
89
81 m_Scene = new SceneHelpers().SetupScene("Test", UUID.Random(), 1000, 1000, config); 90 m_Scene = new SceneHelpers().SetupScene("Test", UUID.Random(), 1000, 1000, config);
82 // Add modules 91 // Add modules
83 SceneHelpers.SetupSceneModules(m_Scene, config, new DefaultPermissionsModule(), new InventoryTransferModule(), new BasicInventoryAccessModule()); 92 SceneHelpers.SetupSceneModules(m_Scene, config, new DefaultPermissionsModule(), new InventoryTransferModule(), new BasicInventoryAccessModule());