Standard library folders can now be configued in the xml in inventory/OpenSimLibrary - no hardcoded changes are required. For some reason, all the folders are currently

showing up as texture folders, even though they are configured with the same types as the agent inventory folders.  This should be resolved soon.

2 files changed, 21 insertions, 6 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fa2a989..2a3f947 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -326,12 +326,25 @@ namespace OpenSim
 
             m_moduleLoader = new ModuleLoader(m_log, m_config);
 
-            MainLog.Instance.Verbose("Plugins", "Loading OpenSim application plugins");
-            foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/Startup"))
-            {
+            ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
+            MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
+            
+            foreach (TypeExtensionNode node in nodes)
+            {                    
                 IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance();
-                plugin.Initialise(this);
-                m_plugins.Add(plugin);
+                                
+                // Debug code to try and track down a bizzare ubuntu/mono/linux bug on standalone where we
+                // appear to try and initialize all the plugins twice.  Currently disabled
+//                MainLog.Instance.Verbose("PLUGINS", "Hitting plugin {0}", plugin.ToString());
+//                if (m_plugins.Contains(plugin))
+//                {
+//                    MainLog.Instance.Verbose("PLUGINS", "Skipping {0}", plugin.ToString());
+//                }
+//                else
+//                {
+                    plugin.Initialise(this);
+                    m_plugins.Add(plugin);
+//                }
             }
 
             // Start UDP servers
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index bf5f205..0fb86af 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,7 +30,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
+
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.UserManagement;
 using InventoryFolder=OpenSim.Framework.InventoryFolder;
@@ -52,7 +54,7 @@ namespace OpenSim.Region.Communications.Local
 
         public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent,
                                  NetworkServersInfo serversInfo, bool authenticate)
-            : base(userManager, welcomeMess)
+            : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess)
         {
             m_Parent = parent;
             this.serversInfo = serversInfo;