3 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 139e0ca..fbb7660 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
         {
-            if (uuid == CommsManager.UserProfileCacheService.LibraryRoot.Owner)
+            if (LibraryService != null && (LibraryService.LibraryRootFolder.Owner == uuid))
             {
                 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
             }
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index ef8008c..ebddfd5 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -19,6 +19,8 @@
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
+    LibraryModule = true
+
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 512e88f..5dadace 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -24,9 +24,9 @@
     NeighbourServiceInConnector = true
     HypergridServiceInConnector = true
     SimulationServiceInConnector = true
+    LibraryModule = true
     InventoryServiceInConnector = false
     AssetServiceInConnector = false
-    LibraryModule = false
     LLLoginServiceInConnector = false
 
 [AssetService]