* 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.exampleslimupdates2
parent
4183cef409
commit
53594e599e
|
@ -1154,6 +1154,21 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (folder == null)
|
if (folder == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// TODO: This code for looking in the folder for the library should be folded somewhere else
|
||||||
|
// so that this class doesn't have to know the details (and so that multiple libraries, etc.
|
||||||
|
// can be handled transparently).
|
||||||
|
InventoryFolderImpl fold = null;
|
||||||
|
if (LibraryService != null && LibraryService.LibraryRootFolder != null)
|
||||||
|
{
|
||||||
|
if ((fold = LibraryService.LibraryRootFolder.FindFolder(folder.ID)) != null)
|
||||||
|
{
|
||||||
|
client.SendInventoryFolderDetails(
|
||||||
|
fold.Owner, folder.ID, fold.RequestListOfItems(),
|
||||||
|
fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Fetch the folder contents
|
// Fetch the folder contents
|
||||||
InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID);
|
InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID);
|
||||||
|
|
||||||
|
@ -1164,7 +1179,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
//m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
|
//m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
|
||||||
// contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
|
// contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
|
||||||
|
|
||||||
if (containingFolder != null)
|
if (containingFolder != null && containingFolder != null)
|
||||||
client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
|
client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -513,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
// FIXME MAYBE: We're not handling sortOrder!
|
// FIXME MAYBE: We're not handling sortOrder!
|
||||||
|
|
||||||
// TODO: This code for looking in the folder for the library should be folded back into the
|
// TODO: This code for looking in the folder for the library should be folded somewhere else
|
||||||
// CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
|
// so that this class doesn't have to know the details (and so that multiple libraries, etc.
|
||||||
// can be handled transparently).
|
// can be handled transparently).
|
||||||
InventoryFolderImpl fold = null;
|
InventoryFolderImpl fold = null;
|
||||||
if (LibraryService != null && LibraryService.LibraryRootFolder != null)
|
if (LibraryService != null && LibraryService.LibraryRootFolder != null)
|
||||||
|
|
|
@ -125,6 +125,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
||||||
|
|
||||||
WelcomeMessage = "Welcome, Avatar!"
|
WelcomeMessage = "Welcome, Avatar!"
|
||||||
|
AllowRemoteSetLoginLevel = "false"
|
||||||
|
|
||||||
; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
|
; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
|
||||||
; CHANGE THIS
|
; CHANGE THIS
|
||||||
HomeURI = "http://127.0.0.1:8002"
|
HomeURI = "http://127.0.0.1:8002"
|
||||||
|
|
|
@ -126,7 +126,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
||||||
|
|
||||||
WelcomeMessage = "Welcome, Avatar!"
|
WelcomeMessage = "Welcome, Avatar!"
|
||||||
AllowRemoteSetLoginLevel = "false";
|
AllowRemoteSetLoginLevel = "false"
|
||||||
|
|
||||||
|
|
||||||
[GridInfoService]
|
[GridInfoService]
|
||||||
|
|
|
@ -40,5 +40,10 @@
|
||||||
|
|
||||||
AllowHypergridMapSearch = true
|
AllowHypergridMapSearch = true
|
||||||
|
|
||||||
|
[LibraryService]
|
||||||
|
LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
|
||||||
|
LibraryName = "OpenSim Library"
|
||||||
|
DefaultLibrary = "./inventory/Libraries.xml"
|
||||||
|
|
||||||
[Friends]
|
[Friends]
|
||||||
Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
|
Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
|
||||||
|
|
Loading…
Reference in New Issue