diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/HGInventoryService.cs | 2 | ||||
-rw-r--r-- | bin/OpenSim.Server.HG.ini.example | 25 | ||||
-rw-r--r-- | bin/OpenSim.Server.ini.example | 24 |
4 files changed, 12 insertions, 41 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs index cf5d521..a537067 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
68 | } | 68 | } |
69 | 69 | ||
70 | AddHttpHandlers(server); | 70 | AddHttpHandlers(server); |
71 | m_log.Debug("[HG HG INVENTORY HANDLER]: handlers initialized"); | 71 | m_log.Debug("[HG INVENTORY HANDLER]: handlers initialized"); |
72 | } | 72 | } |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
diff --git a/OpenSim/Services/InventoryService/HGInventoryService.cs b/OpenSim/Services/InventoryService/HGInventoryService.cs index 85f3bfc..061effe 100644 --- a/OpenSim/Services/InventoryService/HGInventoryService.cs +++ b/OpenSim/Services/InventoryService/HGInventoryService.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Services.InventoryService | |||
87 | if (m_Database == null) | 87 | if (m_Database == null) |
88 | throw new Exception("Could not find a storage interface in the given module"); | 88 | throw new Exception("Could not find a storage interface in the given module"); |
89 | 89 | ||
90 | m_log.Debug("[HG INVENTORY SERVVICE]: Starting..."); | 90 | m_log.Debug("[HG INVENTORY SERVICE]: Starting..."); |
91 | } | 91 | } |
92 | 92 | ||
93 | public override bool CreateUserInventory(UUID principalID) | 93 | public override bool CreateUserInventory(UUID principalID) |
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index 1f63470..0ba8601 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example | |||
@@ -11,7 +11,7 @@ | |||
11 | ;; | 11 | ;; |
12 | 12 | ||
13 | [Startup] | 13 | [Startup] |
14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
15 | 15 | ||
16 | ; * This is common for all services, it's the network setup for the entire | 16 | ; * This is common for all services, it's the network setup for the entire |
17 | ; * server instance, if none if specified above | 17 | ; * server instance, if none if specified above |
@@ -26,6 +26,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
26 | ;ConsolePass = secret | 26 | ;ConsolePass = secret |
27 | ;ConsolePort = 0 | 27 | ;ConsolePort = 0 |
28 | 28 | ||
29 | [DatabaseService] | ||
30 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
31 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
32 | |||
29 | ; * As an example, the below configuration precisely mimicks the legacy | 33 | ; * As an example, the below configuration precisely mimicks the legacy |
30 | ; * asset server. It is read by the asset IN connector (defined above) | 34 | ; * asset server. It is read by the asset IN connector (defined above) |
31 | ; * and it then loads the OUT connector (a local database module). That, | 35 | ; * and it then loads the OUT connector (a local database module). That, |
@@ -35,8 +39,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
35 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 39 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
36 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 40 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
37 | AssetLoaderArgs = "assets/AssetSets.xml" | 41 | AssetLoaderArgs = "assets/AssetSets.xml" |
38 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
39 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
40 | 42 | ||
41 | ; * This configuration loads the inventory server modules. It duplicates | 43 | ; * This configuration loads the inventory server modules. It duplicates |
42 | ; * the function of the legacy inventory server | 44 | ; * the function of the legacy inventory server |
@@ -44,8 +46,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
44 | [InventoryService] | 46 | [InventoryService] |
45 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 47 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" |
46 | SessionAuthentication = "false" | 48 | SessionAuthentication = "false" |
47 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
48 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
49 | 49 | ||
50 | ; * This is the new style grid service. | 50 | ; * This is the new style grid service. |
51 | ; * "Realm" is the table that is used for user lookup. | 51 | ; * "Realm" is the table that is used for user lookup. |
@@ -53,8 +53,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
53 | ; * | 53 | ; * |
54 | [GridService] | 54 | [GridService] |
55 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 55 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
56 | StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | ||
57 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
58 | Realm = "regions" | 56 | Realm = "regions" |
59 | ; AllowDuplicateNames = "True" | 57 | ; AllowDuplicateNames = "True" |
60 | ;; Next, we can specify properties of regions, including default and fallback regions | 58 | ;; Next, we can specify properties of regions, including default and fallback regions |
@@ -77,9 +75,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
77 | [AuthenticationService] | 75 | [AuthenticationService] |
78 | ; for the server connector | 76 | ; for the server connector |
79 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 77 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
80 | ; for the service | ||
81 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
82 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
83 | 78 | ||
84 | [OpenIdService] | 79 | [OpenIdService] |
85 | ; for the server connector | 80 | ; for the server connector |
@@ -93,10 +88,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
93 | [UserAccountService] | 88 | [UserAccountService] |
94 | ; for the server connector | 89 | ; for the server connector |
95 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 90 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
96 | ; for the service | ||
97 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
98 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
99 | ; Realm = "useraccounts" | ||
100 | ;; These are for creating new accounts by the service | 91 | ;; These are for creating new accounts by the service |
101 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 92 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
102 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 93 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
@@ -106,16 +97,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
106 | [PresenceService] | 97 | [PresenceService] |
107 | ; for the server connector | 98 | ; for the server connector |
108 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" | 99 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" |
109 | ; for the service | ||
110 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
111 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
112 | 100 | ||
113 | [AvatarService] | 101 | [AvatarService] |
114 | ; for the server connector | 102 | ; for the server connector |
115 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 103 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
116 | ; for the service | ||
117 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
118 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
119 | 104 | ||
120 | [LibraryService] | 105 | [LibraryService] |
121 | LibraryName = "OpenSim Library" | 106 | LibraryName = "OpenSim Library" |
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 6912d88..543d20d 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example | |||
@@ -26,6 +26,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
26 | ;ConsolePass = secret | 26 | ;ConsolePass = secret |
27 | ;ConsolePort = 0 | 27 | ;ConsolePort = 0 |
28 | 28 | ||
29 | [DatabaseService] | ||
30 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
31 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
32 | |||
33 | |||
29 | ; * As an example, the below configuration precisely mimicks the legacy | 34 | ; * As an example, the below configuration precisely mimicks the legacy |
30 | ; * asset server. It is read by the asset IN connector (defined above) | 35 | ; * asset server. It is read by the asset IN connector (defined above) |
31 | ; * and it then loads the OUT connector (a local database module). That, | 36 | ; * and it then loads the OUT connector (a local database module). That, |
@@ -35,8 +40,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
35 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 40 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
36 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 41 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
37 | AssetLoaderArgs = "assets/AssetSets.xml" | 42 | AssetLoaderArgs = "assets/AssetSets.xml" |
38 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
39 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
40 | 43 | ||
41 | ; * This configuration loads the inventory server modules. It duplicates | 44 | ; * This configuration loads the inventory server modules. It duplicates |
42 | ; * the function of the legacy inventory server | 45 | ; * the function of the legacy inventory server |
@@ -44,8 +47,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
44 | [InventoryService] | 47 | [InventoryService] |
45 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 48 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" |
46 | SessionAuthentication = "false" | 49 | SessionAuthentication = "false" |
47 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
48 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
49 | 50 | ||
50 | ; * This is the new style grid service. | 51 | ; * This is the new style grid service. |
51 | ; * "Realm" is the table that is used for user lookup. | 52 | ; * "Realm" is the table that is used for user lookup. |
@@ -53,8 +54,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
53 | ; * | 54 | ; * |
54 | [GridService] | 55 | [GridService] |
55 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 56 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
56 | StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | ||
57 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
58 | Realm = "regions" | 57 | Realm = "regions" |
59 | ; AllowDuplicateNames = "True" | 58 | ; AllowDuplicateNames = "True" |
60 | ;; Next, we can specify properties of regions, including default and fallback regions | 59 | ;; Next, we can specify properties of regions, including default and fallback regions |
@@ -77,9 +76,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
77 | [AuthenticationService] | 76 | [AuthenticationService] |
78 | ; for the server connector | 77 | ; for the server connector |
79 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 78 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
80 | ; for the service | ||
81 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
82 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
83 | 79 | ||
84 | [OpenIdService] | 80 | [OpenIdService] |
85 | ; for the server connector | 81 | ; for the server connector |
@@ -93,9 +89,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
93 | [UserAccountService] | 89 | [UserAccountService] |
94 | ; for the server connector | 90 | ; for the server connector |
95 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 91 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
96 | ; for the service | ||
97 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
98 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
99 | ; Realm = "useraccounts" | 92 | ; Realm = "useraccounts" |
100 | ;; These are for creating new accounts by the service | 93 | ;; These are for creating new accounts by the service |
101 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 94 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
@@ -106,16 +99,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
106 | [PresenceService] | 99 | [PresenceService] |
107 | ; for the server connector | 100 | ; for the server connector |
108 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" | 101 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" |
109 | ; for the service | ||
110 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
111 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
112 | 102 | ||
113 | [AvatarService] | 103 | [AvatarService] |
114 | ; for the server connector | 104 | ; for the server connector |
115 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 105 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
116 | ; for the service | ||
117 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
118 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | ||
119 | 106 | ||
120 | [LibraryService] | 107 | [LibraryService] |
121 | LibraryName = "OpenSim Library" | 108 | LibraryName = "OpenSim Library" |
@@ -134,6 +121,5 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
134 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" | 121 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" |
135 | LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" | 122 | LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" |
136 | 123 | ||
137 | DefaultRegion = "OpenSim Test" | ||
138 | WelcomeMessage = "Welcome, Avatar!" | 124 | WelcomeMessage = "Welcome, Avatar!" |
139 | 125 | ||