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

author: Justin Clark-Casey (justincc) 2010-09-08 01:05:56 +0100
committer: Justin Clark-Casey (justincc) 2010-09-08 01:05:56 +0100
commit: b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch)
tree: 67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643 /bin/config-include
parent: If a scene object part UUID is changed (only possible when not in a scene), t... (diff)
parent: Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff)
download: opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip
opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz
opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2
opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz
2 files changed, 14 insertions, 14 deletions
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..49ba2ca 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
    Include-Common = "config-include/GridCommon.ini"
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    GridServices = "SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
    
    NeighbourServices = "RemoteNeighbourServicesConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
    ServicesConnectorModule = SimianGroupsServicesConnector
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..9b27cc7 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
    Include-Common = "config-include/GridCommon.ini"
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    GridServices = "SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
-    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
+    AssetServices = "SimianAssetServiceConnector"
-    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
+    InventoryServices = "SimianInventoryServiceConnector"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
    
    NeighbourServices = "RemoteNeighbourServicesConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
    ServicesConnectorModule = SimianGroupsServicesConnector
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
author	Justin Clark-Casey (justincc)	2010-09-08 01:05:56 +0100
committer	Justin Clark-Casey (justincc)	2010-09-08 01:05:56 +0100
commit	b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch)
tree	67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643 /bin/config-include
parent	If a scene object part UUID is changed (only possible when not in a scene), t... (diff)
parent	Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff)
download	opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2 opensim-SC-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz

diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 87ffe69..49ba2ca 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
21	Include-Common = "config-include/GridCommon.ini"	21	Include-Common = "config-include/GridCommon.ini"
22		22
23	[Modules]	23	[Modules]
24	GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"	24	GridServices = "SimianGridServiceConnector"
25	PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"	25	PresenceServices = "SimianPresenceServiceConnector"
26	UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"	26	UserAccountServices = "SimianUserAccountServiceConnector"
27	AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"	27	AuthenticationServices = "SimianAuthenticationServiceConnector"
28	AssetServices = "HGAssetBroker"	28	AssetServices = "HGAssetBroker"
29	InventoryServices = "HGInventoryBroker"	29	InventoryServices = "HGInventoryBroker"
30	AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"	30	AvatarServices = "SimianAvatarServiceConnector"
31		31
32	NeighbourServices = "RemoteNeighbourServicesConnector"	32	NeighbourServices = "RemoteNeighbourServicesConnector"
33	SimulationServices = "RemoteSimulationConnectorModule"	33	SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
74	ServicesConnectorModule = SimianGroupsServicesConnector	74	ServicesConnectorModule = SimianGroupsServicesConnector
75		75
76	[Profiles]	76	[Profiles]
77	Module = SimianProfiles	77	Module = "SimianProfiles"


diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 65d4ea6..9b27cc7 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
21	Include-Common = "config-include/GridCommon.ini"	21	Include-Common = "config-include/GridCommon.ini"
22		22
23	[Modules]	23	[Modules]
24	GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"	24	GridServices = "SimianGridServiceConnector"
25	PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"	25	PresenceServices = "SimianPresenceServiceConnector"
26	UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"	26	UserAccountServices = "SimianUserAccountServiceConnector"
27	AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"	27	AuthenticationServices = "SimianAuthenticationServiceConnector"
28	AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"	28	AssetServices = "SimianAssetServiceConnector"
29	InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"	29	InventoryServices = "SimianInventoryServiceConnector"
30	AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"	30	AvatarServices = "SimianAvatarServiceConnector"
31		31
32	NeighbourServices = "RemoteNeighbourServicesConnector"	32	NeighbourServices = "RemoteNeighbourServicesConnector"
33	SimulationServices = "RemoteSimulationConnectorModule"	33	SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
67	ServicesConnectorModule = SimianGroupsServicesConnector	67	ServicesConnectorModule = SimianGroupsServicesConnector
68		68
69	[Profiles]	69	[Profiles]
70	Module = SimianProfiles	70	Module = "SimianProfiles"