aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-10 14:12:03 -0800
committerDiva Canto2010-01-10 14:12:03 -0800
commit6998668bbcf6479f0ea0728024f24666c8cb0f8a (patch)
treef70528cbc1a073015abe62c4171a84ad56310a9f
parent* OMG! All but one references to UserProfileCacheService have been rerouted! (diff)
downloadopensim-SC_OLD-6998668bbcf6479f0ea0728024f24666c8cb0f8a.zip
opensim-SC_OLD-6998668bbcf6479f0ea0728024f24666c8cb0f8a.tar.gz
opensim-SC_OLD-6998668bbcf6479f0ea0728024f24666c8cb0f8a.tar.bz2
opensim-SC_OLD-6998668bbcf6479f0ea0728024f24666c8cb0f8a.tar.xz
* Last reference to CommsManager.UserProfileCacheService removed
* Grided-sims added the Library module
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--bin/config-include/Grid.ini2
-rw-r--r--bin/config-include/GridHypergrid.ini2
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
419 419
420 public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) 420 public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
421 { 421 {
422 if (uuid == CommsManager.UserProfileCacheService.LibraryRoot.Owner) 422 if (LibraryService != null && (LibraryService.LibraryRootFolder.Owner == uuid))
423 { 423 {
424 remote_client.SendNameReply(uuid, "Mr", "OpenSim"); 424 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
425 } 425 }
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 @@
19 LandServiceInConnector = true 19 LandServiceInConnector = true
20 NeighbourServiceInConnector = true 20 NeighbourServiceInConnector = true
21 SimulationServiceInConnector = true 21 SimulationServiceInConnector = true
22 LibraryModule = true
23
22 24
23[GridService] 25[GridService]
24 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 26 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 @@
24 NeighbourServiceInConnector = true 24 NeighbourServiceInConnector = true
25 HypergridServiceInConnector = true 25 HypergridServiceInConnector = true
26 SimulationServiceInConnector = true 26 SimulationServiceInConnector = true
27 LibraryModule = true
27 InventoryServiceInConnector = false 28 InventoryServiceInConnector = false
28 AssetServiceInConnector = false 29 AssetServiceInConnector = false
29 LibraryModule = false
30 LLLoginServiceInConnector = false 30 LLLoginServiceInConnector = false
31 31
32[AssetService] 32[AssetService]