aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-05-02 10:31:35 -0700
committerDiva Canto2010-05-02 10:31:35 -0700
commitbd49985afa0a30cf9338730807a42eff3d508bee (patch)
tree46786ed3004402af809e99a67a7bd1a3dbf182af
parentadd operation to "nant distbin" to copy StandaloneCommon.ini.example -> Stand... (diff)
downloadopensim-SC_OLD-bd49985afa0a30cf9338730807a42eff3d508bee.zip
opensim-SC_OLD-bd49985afa0a30cf9338730807a42eff3d508bee.tar.gz
opensim-SC_OLD-bd49985afa0a30cf9338730807a42eff3d508bee.tar.bz2
opensim-SC_OLD-bd49985afa0a30cf9338730807a42eff3d508bee.tar.xz
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
-rw-r--r--OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql38
-rw-r--r--OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql9
-rw-r--r--OpenSim/Data/SQLite/SQLiteXInventoryData.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs111
-rw-r--r--bin/Robust.HG.ini.example9
-rw-r--r--bin/Robust.ini.example9
-rw-r--r--bin/config-include/Grid.ini2
-rw-r--r--bin/config-include/GridHypergrid.ini3
-rw-r--r--bin/config-include/Standalone.ini6
-rw-r--r--bin/config-include/StandaloneHypergrid.ini9
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini6
11 files changed, 99 insertions, 105 deletions
diff --git a/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql b/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql
new file mode 100644
index 0000000..7e21996
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql
@@ -0,0 +1,38 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE inventoryfolders(
4 folderName varchar(255),
5 type integer,
6 version integer,
7 folderID varchar(255) primary key,
8 agentID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
9 parentFolderID varchar(255) not null default '00000000-0000-0000-0000-000000000000');
10
11CREATE TABLE inventoryitems(
12 assetID varchar(255),
13 assetType integer,
14 inventoryName varchar(255),
15 inventoryDescription varchar(255),
16 inventoryNextPermissions integer,
17 inventoryCurrentPermissions integer,
18 invType integer,
19 creatorID varchar(255),
20 inventoryBasePermissions integer,
21 inventoryEveryOnePermissions integer,
22 salePrice integer default 99,
23 saleType integer default 0,
24 creationDate integer default 2000,
25 groupID varchar(255) default '00000000-0000-0000-0000-000000000000',
26 groupOwned integer default 0,
27 flags integer default 0,
28 inventoryID varchar(255) primary key,
29 parentFolderID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
30 avatarID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
31 inventoryGroupPermissions integer not null default 0);
32
33create index inventoryfolders_agentid on inventoryfolders(agentID);
34create index inventoryfolders_parentid on inventoryfolders(parentFolderID);
35create index inventoryitems_parentfolderid on inventoryitems(parentFolderID);
36create index inventoryitems_avatarid on inventoryitems(avatarID);
37
38COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql
new file mode 100644
index 0000000..545d233
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql
@@ -0,0 +1,9 @@
1BEGIN TRANSACTION;
2
3ATTACH 'inventoryStore.db' AS old;
4
5INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders;
6
7INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems;
8
9COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index be1d041..6064538 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.SQLite
49 public SQLiteXInventoryData(string conn, string realm) 49 public SQLiteXInventoryData(string conn, string realm)
50 { 50 {
51 m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>( 51 m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
52 conn, "inventoryfolders", "InventoryStore"); 52 conn, "inventoryfolders", "XInventoryStore");
53 m_Items = new SqliteItemHandler( 53 m_Items = new SqliteItemHandler(
54 conn, "inventoryitems", String.Empty); 54 conn, "inventoryitems", String.Empty);
55 } 55 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a2f26d5..22bd04c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
41 41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
43{ 43{
44 public class LocalInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService 44 public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService
45 { 45 {
46 private static readonly ILog m_log = 46 private static readonly ILog m_log =
47 LogManager.GetLogger( 47 LogManager.GetLogger(
@@ -50,7 +50,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
50 private IInventoryService m_InventoryService; 50 private IInventoryService m_InventoryService;
51 51
52 private bool m_Enabled = false; 52 private bool m_Enabled = false;
53 private bool m_Initialized = false;
54 53
55 public Type ReplaceableInterface 54 public Type ReplaceableInterface
56 { 55 {
@@ -93,23 +92,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
93 if (m_InventoryService == null) 92 if (m_InventoryService == null)
94 { 93 {
95 m_log.Error("[LOCAL INVENTORY SERVICES CONNECTOR]: Can't load inventory service"); 94 m_log.Error("[LOCAL INVENTORY SERVICES CONNECTOR]: Can't load inventory service");
96 //return;
97 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's"); 95 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
98 } 96 }
99 97
100 //List<IInventoryDataPlugin> plugins
101 // = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
102 // configSettings.StandaloneInventoryPlugin,
103 // configSettings.StandaloneInventorySource);
104
105 //foreach (IInventoryDataPlugin plugin in plugins)
106 //{
107 // // Using the OSP wrapper plugin for database plugins should be made configurable at some point
108 // m_InventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
109 //}
110
111 Init(source);
112
113 m_Enabled = true; 98 m_Enabled = true;
114 m_log.Info("[LOCAL INVENTORY SERVICES CONNECTOR]: Local inventory connector enabled"); 99 m_log.Info("[LOCAL INVENTORY SERVICES CONNECTOR]: Local inventory connector enabled");
115 } 100 }
@@ -128,99 +113,60 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
128 { 113 {
129 if (!m_Enabled) 114 if (!m_Enabled)
130 return; 115 return;
131
132 if (!m_Initialized)
133 {
134 m_Initialized = true;
135 }
136
137// m_log.DebugFormat(
138// "[LOCAL INVENTORY SERVICES CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName);
139 116
140 scene.RegisterModuleInterface<IInventoryService>(this); 117 scene.RegisterModuleInterface<IInventoryService>(this);
141 m_cache.AddRegion(scene);
142 } 118 }
143 119
144 public void RemoveRegion(Scene scene) 120 public void RemoveRegion(Scene scene)
145 { 121 {
146 if (!m_Enabled) 122 if (!m_Enabled)
147 return; 123 return;
148
149 m_cache.RemoveRegion(scene);
150 } 124 }
151 125
152 public void RegionLoaded(Scene scene) 126 public void RegionLoaded(Scene scene)
153 { 127 {
154 if (!m_Enabled) 128 if (!m_Enabled)
155 return; 129 return;
156
157 m_log.InfoFormat(
158 "[LOCAL INVENTORY SERVICES CONNECTOR]: Enabled local inventory for region {0}", scene.RegionInfo.RegionName);
159 } 130 }
160 131
161 #region IInventoryService 132 #region IInventoryService
162 133
163 public override bool CreateUserInventory(UUID user) 134 public bool CreateUserInventory(UUID user)
164 { 135 {
165 return m_InventoryService.CreateUserInventory(user); 136 return m_InventoryService.CreateUserInventory(user);
166 } 137 }
167 138
168 public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId) 139 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
169 { 140 {
170 return m_InventoryService.GetInventorySkeleton(userId); 141 return m_InventoryService.GetInventorySkeleton(userId);
171 } 142 }
172 143
173 public override InventoryCollection GetUserInventory(UUID id) 144 public InventoryCollection GetUserInventory(UUID id)
174 { 145 {
175 return m_InventoryService.GetUserInventory(id); 146 return m_InventoryService.GetUserInventory(id);
176 } 147 }
177 148
178 public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) 149 public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
179 { 150 {
180 m_InventoryService.GetUserInventory(userID, callback); 151 m_InventoryService.GetUserInventory(userID, callback);
181 } 152 }
182 153
183 // Inherited. See base 154 public InventoryFolderBase GetRootFolder(UUID userID)
184 //public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
185 //{
186 // return m_InventoryService.GetFolderForType(userID, type);
187 //}
188
189 public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
190 { 155 {
191 InventoryFolderBase root = m_InventoryService.GetRootFolder(userID); 156 return m_InventoryService.GetRootFolder(userID);
192 if (root != null) 157 }
193 {
194 InventoryCollection content = GetFolderContent(userID, root.ID);
195 if (content != null)
196 {
197 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
198 foreach (InventoryFolderBase folder in content.Folders)
199 {
200 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
201 {
202 //m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type);
203 folders[(AssetType)folder.Type] = folder;
204 }
205 }
206 // Put the root folder there, as type Folder
207 folders[AssetType.Folder] = root;
208 //m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type);
209 158
210 return folders; 159 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
211 } 160 {
212 } 161 return m_InventoryService.GetFolderForType(userID, type);
213 m_log.WarnFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: System folders for {0} not found", userID);
214 return new Dictionary<AssetType, InventoryFolderBase>();
215 } 162 }
216 163
217 public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) 164 public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
218 { 165 {
219 return m_InventoryService.GetFolderContent(userID, folderID); 166 return m_InventoryService.GetFolderContent(userID, folderID);
220 } 167 }
221 168
222 169 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
223 public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
224 { 170 {
225 return m_InventoryService.GetFolderItems(userID, folderID); 171 return m_InventoryService.GetFolderItems(userID, folderID);
226 } 172 }
@@ -230,7 +176,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
230 /// </summary> 176 /// </summary>
231 /// <param name="folder"></param> 177 /// <param name="folder"></param>
232 /// <returns>true if the folder was successfully added</returns> 178 /// <returns>true if the folder was successfully added</returns>
233 public override bool AddFolder(InventoryFolderBase folder) 179 public bool AddFolder(InventoryFolderBase folder)
234 { 180 {
235 return m_InventoryService.AddFolder(folder); 181 return m_InventoryService.AddFolder(folder);
236 } 182 }
@@ -240,7 +186,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
240 /// </summary> 186 /// </summary>
241 /// <param name="folder"></param> 187 /// <param name="folder"></param>
242 /// <returns>true if the folder was successfully updated</returns> 188 /// <returns>true if the folder was successfully updated</returns>
243 public override bool UpdateFolder(InventoryFolderBase folder) 189 public bool UpdateFolder(InventoryFolderBase folder)
244 { 190 {
245 return m_InventoryService.UpdateFolder(folder); 191 return m_InventoryService.UpdateFolder(folder);
246 } 192 }
@@ -250,12 +196,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
250 /// </summary> 196 /// </summary>
251 /// <param name="folder">A folder containing the details of the new location</param> 197 /// <param name="folder">A folder containing the details of the new location</param>
252 /// <returns>true if the folder was successfully moved</returns> 198 /// <returns>true if the folder was successfully moved</returns>
253 public override bool MoveFolder(InventoryFolderBase folder) 199 public bool MoveFolder(InventoryFolderBase folder)
254 { 200 {
255 return m_InventoryService.MoveFolder(folder); 201 return m_InventoryService.MoveFolder(folder);
256 } 202 }
257 203
258 public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) 204 public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
259 { 205 {
260 return m_InventoryService.DeleteFolders(ownerID, folderIDs); 206 return m_InventoryService.DeleteFolders(ownerID, folderIDs);
261 } 207 }
@@ -265,18 +211,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
265 /// </summary> 211 /// </summary>
266 /// <param name="folder"></param> 212 /// <param name="folder"></param>
267 /// <returns>true if the folder was successfully purged</returns> 213 /// <returns>true if the folder was successfully purged</returns>
268 public override bool PurgeFolder(InventoryFolderBase folder) 214 public bool PurgeFolder(InventoryFolderBase folder)
269 { 215 {
270 return m_InventoryService.PurgeFolder(folder); 216 return m_InventoryService.PurgeFolder(folder);
271 } 217 }
272 218
273 /// <summary> 219 /// <summary>
274 /// Add a new item to the user's inventory, plain 220 /// Add a new item to the user's inventory
275 /// Called by base class AddItem
276 /// </summary> 221 /// </summary>
277 /// <param name="item"></param> 222 /// <param name="item"></param>
278 /// <returns>true if the item was successfully added</returns> 223 /// <returns>true if the item was successfully added</returns>
279 protected override bool AddItemPlain(InventoryItemBase item) 224 public bool AddItem(InventoryItemBase item)
280 { 225 {
281 return m_InventoryService.AddItem(item); 226 return m_InventoryService.AddItem(item);
282 } 227 }
@@ -286,13 +231,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
286 /// </summary> 231 /// </summary>
287 /// <param name="item"></param> 232 /// <param name="item"></param>
288 /// <returns>true if the item was successfully updated</returns> 233 /// <returns>true if the item was successfully updated</returns>
289 public override bool UpdateItem(InventoryItemBase item) 234 public bool UpdateItem(InventoryItemBase item)
290 { 235 {
291 return m_InventoryService.UpdateItem(item); 236 return m_InventoryService.UpdateItem(item);
292 } 237 }
293 238
294 239
295 public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items) 240 public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
296 { 241 {
297 return m_InventoryService.MoveItems(ownerID, items); 242 return m_InventoryService.MoveItems(ownerID, items);
298 } 243 }
@@ -302,12 +247,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
302 /// </summary> 247 /// </summary>
303 /// <param name="item"></param> 248 /// <param name="item"></param>
304 /// <returns>true if the item was successfully deleted</returns> 249 /// <returns>true if the item was successfully deleted</returns>
305 public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs) 250 public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
306 { 251 {
307 return m_InventoryService.DeleteItems(ownerID, itemIDs); 252 return m_InventoryService.DeleteItems(ownerID, itemIDs);
308 } 253 }
309 254
310 public override InventoryItemBase GetItem(InventoryItemBase item) 255 public InventoryItemBase GetItem(InventoryItemBase item)
311 { 256 {
312// m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); 257// m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
313 258
@@ -322,7 +267,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
322 return item; 267 return item;
323 } 268 }
324 269
325 public override InventoryFolderBase GetFolder(InventoryFolderBase folder) 270 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
326 { 271 {
327 return m_InventoryService.GetFolder(folder); 272 return m_InventoryService.GetFolder(folder);
328 } 273 }
@@ -332,17 +277,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
332 /// </summary> 277 /// </summary>
333 /// <param name="userID"></param> 278 /// <param name="userID"></param>
334 /// <returns></returns> 279 /// <returns></returns>
335 public override bool HasInventoryForUser(UUID userID) 280 public bool HasInventoryForUser(UUID userID)
336 { 281 {
337 return m_InventoryService.HasInventoryForUser(userID); 282 return m_InventoryService.HasInventoryForUser(userID);
338 } 283 }
339 284
340 public override List<InventoryItemBase> GetActiveGestures(UUID userId) 285 public List<InventoryItemBase> GetActiveGestures(UUID userId)
341 { 286 {
342 return m_InventoryService.GetActiveGestures(userId); 287 return m_InventoryService.GetActiveGestures(userId);
343 } 288 }
344 289
345 public override int GetAssetPermissions(UUID userID, UUID assetID) 290 public int GetAssetPermissions(UUID userID, UUID assetID)
346 { 291 {
347 return m_InventoryService.GetAssetPermissions(userID, assetID); 292 return m_InventoryService.GetAssetPermissions(userID, assetID);
348 } 293 }
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 5e3f9a7..489b66f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -11,7 +11,7 @@
11;; 11;;
12 12
13[Startup] 13[Startup]
14ServiceConnectors = "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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,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" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryServiceInConnector,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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,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
@@ -44,8 +44,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
44; * the function of the legacy inventory server 44; * the function of the legacy inventory server
45; * 45; *
46[InventoryService] 46[InventoryService]
47 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 47 LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
48 SessionAuthentication = "false"
49 48
50; * This is the new style grid service. 49; * This is the new style grid service.
51; * "Realm" is the table that is used for user lookup. 50; * "Realm" is the table that is used for user lookup.
@@ -92,7 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
92 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 91 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
93 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 92 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
94 GridService = "OpenSim.Services.GridService.dll:GridService" 93 GridService = "OpenSim.Services.GridService.dll:GridService"
95 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 94 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
96 95
97[PresenceService] 96[PresenceService]
98 ; for the server connector 97 ; for the server connector
@@ -116,7 +115,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
116 ; for the service 115 ; for the service
117 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 116 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
118 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 117 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
119 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 118 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
120 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 119 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
121 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 120 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
122 GridService = "OpenSim.Services.GridService.dll:GridService" 121 GridService = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 9bedac6..cfc08bc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -11,7 +11,7 @@
11; * 11; *
12[Startup] 12[Startup]
13 13
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
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
@@ -45,8 +45,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
45; * the function of the legacy inventory server 45; * the function of the legacy inventory server
46; * 46; *
47[InventoryService] 47[InventoryService]
48 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 48 LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
49 SessionAuthentication = "false"
50 49
51; * This is the new style grid service. 50; * This is the new style grid service.
52; * "Realm" is the table that is used for user lookup. 51; * "Realm" is the table that is used for user lookup.
@@ -94,7 +93,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
94 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 93 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
95 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 94 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
96 GridService = "OpenSim.Services.GridService.dll:GridService" 95 GridService = "OpenSim.Services.GridService.dll:GridService"
97 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 96 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
98 97
99[PresenceService] 98[PresenceService]
100 ; for the server connector 99 ; for the server connector
@@ -118,7 +117,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
118 ; for the service 117 ; for the service
119 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 118 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
120 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 119 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
121 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 120 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
122 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 121 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
123 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 122 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
124 GridService = "OpenSim.Services.GridService.dll:GridService" 123 GridService = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9dff325..4767cbc 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -9,7 +9,7 @@
9 9
10[Modules] 10[Modules]
11 AssetServices = "RemoteAssetServicesConnector" 11 AssetServices = "RemoteAssetServicesConnector"
12 InventoryServices = "RemoteInventoryServicesConnector" 12 InventoryServices = "RemoteXInventoryServicesConnector"
13 GridServices = "RemoteGridServicesConnector" 13 GridServices = "RemoteGridServicesConnector"
14 AvatarServices = "RemoteAvatarServicesConnector" 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index b567817..051a87e 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,8 +30,7 @@
30 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" 30 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
31 31
32[InventoryService] 32[InventoryService]
33 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" 33 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
34 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
35 34
36[GridService] 35[GridService]
37 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 36 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 92c2154..027b4ea 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,7 +24,7 @@
24 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 24 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
25 25
26[InventoryService] 26[InventoryService]
27 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 27 LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
28 28
29[LibraryService] 29[LibraryService]
30 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 30 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -56,7 +56,7 @@
56 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 56 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
57 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 57 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
58 GridService = "OpenSim.Services.GridService.dll:GridService" 58 GridService = "OpenSim.Services.GridService.dll:GridService"
59 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 59 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
60 60
61[GridUserService] 61[GridUserService]
62 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 62 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -71,7 +71,7 @@
71 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 71 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
72 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 72 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 74 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
76 GridService = "OpenSim.Services.GridService.dll:GridService" 76 GridService = "OpenSim.Services.GridService.dll:GridService"
77 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 77 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1d8e2ef..35e6f20 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -33,11 +33,10 @@
33 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" 33 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
34 34
35[InventoryService] 35[InventoryService]
36 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 36 LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
37 37
38 ; For HGInventoryBroker 38 ; For HGInventoryBroker
39 LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 39 LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
40 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
41 40
42[AvatarService] 41[AvatarService]
43 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 42 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -74,7 +73,7 @@
74 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 74 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
76 GridService = "OpenSim.Services.GridService.dll:GridService" 75 GridService = "OpenSim.Services.GridService.dll:GridService"
77 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 76 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
78 77
79[FriendsService] 78[FriendsService]
80 LocalServiceModule = "OpenSim.Services.FriendsService.dll" 79 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
@@ -88,7 +87,7 @@
88 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 87 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
89 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 88 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
90 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 89 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
91 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 90 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
92 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 91 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
93 GridService = "OpenSim.Services.GridService.dll:GridService" 92 GridService = "OpenSim.Services.GridService.dll:GridService"
94 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 93 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index 1ce0357..ed88a8a 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -3,6 +3,11 @@
3[DatabaseService] 3[DatabaseService]
4 StorageProvider = "OpenSim.Data.SQLite.dll" 4 StorageProvider = "OpenSim.Data.SQLite.dll"
5 5
6[InventoryService]
7 ;ConnectionString = "URI=file:inventory.db,version=3"
8 ; if you have a legacy inventory store use the connection string below
9 ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
10
6[AvatarService] 11[AvatarService]
7 ConnectionString = "URI=file:avatars.db,version=3" 12 ConnectionString = "URI=file:avatars.db,version=3"
8 13
@@ -14,3 +19,4 @@
14 19
15[FriendsService] 20[FriendsService]
16 ConnectionString = "URI=file:friends.db,version=3" 21 ConnectionString = "URI=file:friends.db,version=3"
22