From 239478f3a9b0f651b451282cd204269545b025d9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 3 Aug 2010 16:02:52 -0700
Subject: Bug fix (HG): mantis #4891. This doesn't actually fix the underlying
 bug, but it clears up the circular dependency issue between Gatekeeper and
 UserAgents that had made me resort to in-process remote calls, which, in
 turn, were hitting bugs down there somewhere in mono.

NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
---
 bin/Robust.HG.ini.example                  | 1 +
 bin/config-include/StandaloneHypergrid.ini | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0cf9ab1..9269e39 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -207,6 +207,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
 
 ;; The interface that local users get when they are in other grids.
 ;; This restricts the inventory operations while in other grids.
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index e87270d..35e7da2 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -114,6 +114,8 @@
 	;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+
 	
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
-- 
cgit v1.1


From 9c7e35860e290e6bb77da7749d4d3b82a5c75418 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 4 Aug 2010 01:00:06 +0100
Subject: re-Add the XML configuration loader dll. It's gone AWOL in a cleanup,
 but still needed for web-loading region configs and for loading legacy XML
 region files

---
 bin/OpenSim.Framework.Configuration.XML.dll | Bin 0 -> 5120 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 bin/OpenSim.Framework.Configuration.XML.dll

(limited to 'bin')

diff --git a/bin/OpenSim.Framework.Configuration.XML.dll b/bin/OpenSim.Framework.Configuration.XML.dll
new file mode 100755
index 0000000..de0b875
Binary files /dev/null and b/bin/OpenSim.Framework.Configuration.XML.dll differ
-- 
cgit v1.1


From d987e8ef185c29f5ebed98339b5e21e6d79fba57 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 4 Aug 2010 01:09:51 +0100
Subject: Revert "re-Add the XML configuration loader dll. It's gone AWOL in a
 cleanup, but"

This reverts commit 9c7e35860e290e6bb77da7749d4d3b82a5c75418.
---
 bin/OpenSim.Framework.Configuration.XML.dll | Bin 5120 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 bin/OpenSim.Framework.Configuration.XML.dll

(limited to 'bin')

diff --git a/bin/OpenSim.Framework.Configuration.XML.dll b/bin/OpenSim.Framework.Configuration.XML.dll
deleted file mode 100755
index de0b875..0000000
Binary files a/bin/OpenSim.Framework.Configuration.XML.dll and /dev/null differ
-- 
cgit v1.1