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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-12 19:24:03 +01:00
parent f9ffd2538f 4b7b9e81f7
commit 36e73dbc9b
6 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// if groups aren't enabled, we're not needed. // if groups aren't enabled, we're not needed.
// if we're not specified as the connector to use, then we're not wanted // if we're not specified as the connector to use, then we're not wanted
if ((groupsConfig.GetBoolean("Enabled", false) == false) if ((groupsConfig.GetBoolean("Enabled", false) == false)
|| (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name)) || (groupsConfig.GetString("MessagingModule", "") != Name))
{ {
m_groupMessagingEnabled = false; m_groupMessagingEnabled = false;
return; return;

7
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -102,6 +102,13 @@ namespace OpenSim.Services.GridService
public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db) public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db)
{ {
IConfig modulesConfig = config.Configs["Modules"];
if (modulesConfig == null)
return;
if (modulesConfig.GetString("HypergridLinker", "") != "HypergridLinker")
return;
m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType()); m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType());
m_Database = db; m_Database = db;

2
bin/OpenSimDefaults.ini
View File

@ -1377,7 +1377,7 @@
GroupsCacheTimeout = 30 GroupsCacheTimeout = 30
; Specify which messaging module to use for groups messaging and if it's enabled ; Specify which messaging module to use for groups messaging and if it's enabled
;MessagingModule = GroupsMessagingModule MessagingModule = GroupsMessagingModule
;MessagingEnabled = true ;MessagingEnabled = true
; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend

1
bin/config-include/GridHypergrid.ini
View File

@ -26,6 +26,7 @@
LandServices = "RemoteLandServicesConnector" LandServices = "RemoteLandServicesConnector"
FriendsModule = "HGFriendsModule" FriendsModule = "HGFriendsModule"
MapImageService = "MapImageServiceModule" MapImageService = "MapImageServiceModule"
HypergridLinker = "HypergridLinker"
LandServiceInConnector = true LandServiceInConnector = true
NeighbourServiceInConnector = true NeighbourServiceInConnector = true

1
bin/config-include/HyperSimianGrid.ini
View File

@ -40,6 +40,7 @@
LibraryModule = false LibraryModule = false
AssetCaching = "FlotsamAssetCache" AssetCaching = "FlotsamAssetCache"
HypergridLinker = "HypergridLinker"
[SimulationDataStore] [SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"

1
bin/config-include/StandaloneHypergrid.ini
View File

@ -22,6 +22,7 @@
EntityTransferModule = "HGEntityTransferModule" EntityTransferModule = "HGEntityTransferModule"
InventoryAccessModule = "HGInventoryAccessModule" InventoryAccessModule = "HGInventoryAccessModule"
FriendsModule = "HGFriendsModule" FriendsModule = "HGFriendsModule"
HypergridLinker = "HypergridLinker"
InventoryServiceInConnector = true InventoryServiceInConnector = true
AssetServiceInConnector = true AssetServiceInConnector = true