Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-03-18 20:09:04 +0000
committer: Melanie 2010-03-18 20:09:04 +0000
commit: 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch)
tree: 9fbaf708764f315034a283fd8fedc8afe0864d75 /bin/config-include/SimianGrid.ini
parent: Merge branch 'careminster' into careminster-presence-refactor (diff)
parent: Flesh out the new permission method (diff)
download: opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip
opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz
opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2
opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 58dcae9..064f36e 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -22,7 +22,7 @@
 [Modules]
    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianGridUserAccountServiceConnector"
+    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
author	Melanie	2010-03-18 20:09:04 +0000
committer	Melanie	2010-03-18 20:09:04 +0000
commit	4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch)
tree	9fbaf708764f315034a283fd8fedc8afe0864d75 /bin/config-include/SimianGrid.ini
parent	Merge branch 'careminster' into careminster-presence-refactor (diff)
parent	Flesh out the new permission method (diff)
download	opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 58dcae9..064f36e 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini
@@ -22,7 +22,7 @@
22	[Modules]	22	[Modules]
23	GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"	23	GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
24	PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"	24	PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
25	UserAccountServices = "OpenSim.Services.Connectors.dll:SimianGridUserAccountServiceConnector"	25	UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
26	AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"	26	AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
27	AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"	27	AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
28	InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"	28	InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"