diff options
author | Diva Canto | 2010-05-05 21:12:13 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-05 21:12:13 -0700 |
commit | 53594e599e7f10bed441007f29a08d23e41e9188 (patch) | |
tree | d344611fa5331b7fbe17450ec11727f506c75959 | |
parent | * Fixes LandDataSerializerTests on Windows by stripping CR from the serializa... (diff) | |
download | opensim-SC_OLD-53594e599e7f10bed441007f29a08d23e41e9188.zip opensim-SC_OLD-53594e599e7f10bed441007f29a08d23e41e9188.tar.gz opensim-SC_OLD-53594e599e7f10bed441007f29a08d23e41e9188.tar.bz2 opensim-SC_OLD-53594e599e7f10bed441007f29a08d23e41e9188.tar.xz |
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
* Made previous Robust config changes consistent in Robust.HG.ini.example
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 4 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
-rw-r--r-- | bin/Robust.ini.example | 2 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 5 |
5 files changed, 26 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 20760b2..60f730d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1154,6 +1154,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
1154 | if (folder == null) | 1154 | if (folder == null) |
1155 | return; | 1155 | return; |
1156 | 1156 | ||
1157 | // TODO: This code for looking in the folder for the library should be folded somewhere else | ||
1158 | // so that this class doesn't have to know the details (and so that multiple libraries, etc. | ||
1159 | // can be handled transparently). | ||
1160 | InventoryFolderImpl fold = null; | ||
1161 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) | ||
1162 | { | ||
1163 | if ((fold = LibraryService.LibraryRootFolder.FindFolder(folder.ID)) != null) | ||
1164 | { | ||
1165 | client.SendInventoryFolderDetails( | ||
1166 | fold.Owner, folder.ID, fold.RequestListOfItems(), | ||
1167 | fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); | ||
1168 | return; | ||
1169 | } | ||
1170 | } | ||
1171 | |||
1157 | // Fetch the folder contents | 1172 | // Fetch the folder contents |
1158 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); | 1173 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); |
1159 | 1174 | ||
@@ -1164,7 +1179,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1164 | //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}", | 1179 | //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}", |
1165 | // contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName); | 1180 | // contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName); |
1166 | 1181 | ||
1167 | if (containingFolder != null) | 1182 | if (containingFolder != null && containingFolder != null) |
1168 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems); | 1183 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems); |
1169 | } | 1184 | } |
1170 | 1185 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index bc10230..e25b1f1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -513,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
513 | { | 513 | { |
514 | // FIXME MAYBE: We're not handling sortOrder! | 514 | // FIXME MAYBE: We're not handling sortOrder! |
515 | 515 | ||
516 | // TODO: This code for looking in the folder for the library should be folded back into the | 516 | // TODO: This code for looking in the folder for the library should be folded somewhere else |
517 | // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. | 517 | // so that this class doesn't have to know the details (and so that multiple libraries, etc. |
518 | // can be handled transparently). | 518 | // can be handled transparently). |
519 | InventoryFolderImpl fold = null; | 519 | InventoryFolderImpl fold = null; |
520 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) | 520 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 489b66f..d8145af 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -125,6 +125,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
125 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 125 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
126 | 126 | ||
127 | WelcomeMessage = "Welcome, Avatar!" | 127 | WelcomeMessage = "Welcome, Avatar!" |
128 | AllowRemoteSetLoginLevel = "false" | ||
129 | |||
128 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) | 130 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) |
129 | ; CHANGE THIS | 131 | ; CHANGE THIS |
130 | HomeURI = "http://127.0.0.1:8002" | 132 | HomeURI = "http://127.0.0.1:8002" |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 2679523..ae3a53c 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -126,7 +126,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
126 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 126 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
127 | 127 | ||
128 | WelcomeMessage = "Welcome, Avatar!" | 128 | WelcomeMessage = "Welcome, Avatar!" |
129 | AllowRemoteSetLoginLevel = "false"; | 129 | AllowRemoteSetLoginLevel = "false" |
130 | 130 | ||
131 | 131 | ||
132 | [GridInfoService] | 132 | [GridInfoService] |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 051a87e..1e24f88 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -40,5 +40,10 @@ | |||
40 | 40 | ||
41 | AllowHypergridMapSearch = true | 41 | AllowHypergridMapSearch = true |
42 | 42 | ||
43 | [LibraryService] | ||
44 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | ||
45 | LibraryName = "OpenSim Library" | ||
46 | DefaultLibrary = "./inventory/Libraries.xml" | ||
47 | |||
43 | [Friends] | 48 | [Friends] |
44 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" | 49 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" |