Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-10-06 00:27:10 +0100
committer: Melanie 2010-10-06 00:27:10 +0100
commit: d8149373c15d9ec39c0f836a337e58b633f45829 (patch)
tree: 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /bin/config-include/Standalone.ini
parent: Avoid throwing errors when adding existing meshes to the render scene (diff)
parent: Remove sirikata project (diff)
download: opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.zip
opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz
opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2
opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d74b50e..6355d09 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,10 @@
    AvatarServices          = "LocalAvatarServicesConnector"
    EntityTransferModule    = "BasicEntityTransferModule"
    InventoryAccessModule   = "BasicInventoryAccessModule"
-    
-    LibraryModule                               = true
+    LibraryModule              = true
-    LLLoginServiceInConnector   = true
+    LLLoginServiceInConnector  = true
-    GridInfoServiceInConnector  = true
+    GridInfoServiceInConnector = true
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -35,9 +35,9 @@
    LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 [LibraryService]
-        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-          LibraryName = "OpenSim Library"
+    LibraryName = "OpenSim Library"
-          DefaultLibrary = "./inventory/Libraries.xml"
+    DefaultLibrary = "./inventory/Libraries.xml"
 [AvatarService]
    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -78,7 +78,7 @@
 [LoginService]
    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService               = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -88,7 +88,6 @@
    WelcomeMessage = "Welcome, Avatar!"
 ;; This should always be the very last thing on this file
 [Includes]
    Include-Common = "config-include/StandaloneCommon.ini"
author	Melanie	2010-10-06 00:27:10 +0100
committer	Melanie	2010-10-06 00:27:10 +0100
commit	d8149373c15d9ec39c0f836a337e58b633f45829 (patch)
tree	3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /bin/config-include/Standalone.ini
parent	Avoid throwing errors when adding existing meshes to the render scene (diff)
parent	Remove sirikata project (diff)
download	opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index d74b50e..6355d09 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,10 @@
17	AvatarServices = "LocalAvatarServicesConnector"	17	AvatarServices = "LocalAvatarServicesConnector"
18	EntityTransferModule = "BasicEntityTransferModule"	18	EntityTransferModule = "BasicEntityTransferModule"
19	InventoryAccessModule = "BasicInventoryAccessModule"	19	InventoryAccessModule = "BasicInventoryAccessModule"
20		20
21	LibraryModule = true	21	LibraryModule = true
22	LLLoginServiceInConnector = true	22	LLLoginServiceInConnector = true
23	GridInfoServiceInConnector = true	23	GridInfoServiceInConnector = true
24		24
25	[SimulationDataStore]	25	[SimulationDataStore]
26	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"	26	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -35,9 +35,9 @@
35	LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"	35	LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
36		36
37	[LibraryService]	37	[LibraryService]
38	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"	38	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
39	LibraryName = "OpenSim Library"	39	LibraryName = "OpenSim Library"
40	DefaultLibrary = "./inventory/Libraries.xml"	40	DefaultLibrary = "./inventory/Libraries.xml"
41		41
42	[AvatarService]	42	[AvatarService]
43	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"	43	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -78,7 +78,7 @@
78	[LoginService]	78	[LoginService]
79	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"	79	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
80	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	80	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
81	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"	81	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
82	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	82	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
83	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	83	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
84	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	84	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -88,7 +88,6 @@
88		88
89	WelcomeMessage = "Welcome, Avatar!"	89	WelcomeMessage = "Welcome, Avatar!"
90		90
91
92	;; This should always be the very last thing on this file	91	;; This should always be the very last thing on this file
93	[Includes]	92	[Includes]
94	Include-Common = "config-include/StandaloneCommon.ini"	93	Include-Common = "config-include/StandaloneCommon.ini"