From d21e9c755f004d8fe03b11bc57b810dbd401435a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 19 May 2011 16:54:46 -0700
Subject: HG Friends working to some extent: friendships offered and accepted
 correctly handled. Friends list showing correct foreign names. TODO:
 GrantRights.

---
 bin/config-include/StandaloneHypergrid.ini | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 486f22e..324c258 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,6 +20,7 @@
     AvatarServices			= "LocalAvatarServicesConnector"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
+    FriendsModule		= "HGFriendsModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
@@ -140,6 +141,10 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+[HGFriendsService]
+	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-- 
cgit v1.1


From 336665e03532cf9d7a1ad65d5071e7050bf6ecd0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 22 May 2011 16:51:03 -0700
Subject: More on HG Friends. Added Delete(string, string) across the board.
 Added security to friendship identifiers so that they can safely be deleted
 across worlds. Had to change Get(string) to use LIKE because the secret in
 the identifier is not always known -- affects only HG visitors. BOTTOM LINE
 SO FAR: HG friendships established and deleted safely across grids, local
 rights working but not (yet?) being transmitted back.

---
 bin/config-include/StandaloneHypergrid.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 324c258..f8e8ae2 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -142,7 +142,7 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+	LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
 
 ;; This should always be the very last thing on this file
-- 
cgit v1.1


From 24f28d353427d1905ae1a46408841265379e29c3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 23 May 2011 19:45:39 -0700
Subject: HG friends: Status notifications working. Also initial logins get the
 online friends in other grids.

---
 bin/config-include/StandaloneHypergrid.ini | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f8e8ae2..f56bccd 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -126,6 +126,9 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService	= "OpenSim.Services.FriendsService.dll:FriendsService"
+
 
 	
 ;; The interface that local users get when they are in other grids
-- 
cgit v1.1


From e19031849ec2957f7312d7e2417bd8c8da0efc53 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 24 May 2011 09:38:03 -0700
Subject: Added necessary code to drop inventory on hg friends using the
 profile window, but can't test because this mechanism doesn't seem to work
 without a profile service.

---
 bin/config-include/StandaloneHypergrid.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f56bccd..6cd24b0 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -128,7 +128,7 @@
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
     FriendsService	= "OpenSim.Services.FriendsService.dll:FriendsService"
-
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 	
 ;; The interface that local users get when they are in other grids
-- 
cgit v1.1


From 5c2168cae758ae19367f4c2f5a02713e74fc0912 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 25 May 2011 12:32:21 -0700
Subject: HG: Instant Message working. Tested on HG standalones only. Needs a
 lot more testing.

---
 bin/config-include/StandaloneHypergrid.ini | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 6cd24b0..cd2d7a7 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -32,6 +32,9 @@
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
 
+[Messaging]
+	MessageTransferModule = HGMessageTransferModule
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
@@ -148,6 +151,13 @@
 	LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
 
+[HGInstantMessageService]
+	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+	GridService = "OpenSim.Services.GridService.dll:GridService"
+	PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
+	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-- 
cgit v1.1


From 0c58a9e68074f3593920dc9f2356bbed96416497 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 26 May 2011 10:04:48 -0700
Subject: HG IM in grid mode working fairly well. Unknown target user
 references looked back in source user's User Agent service.

---
 bin/config-include/GridCommon.ini.example |  6 ++++++
 bin/config-include/GridHypergrid.ini      | 11 +++++++++++
 2 files changed, 17 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index bc8bc0f..b2ecc79 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -93,6 +93,12 @@
 	;; uncomment the next line. You may want to do this on sims that have licensed content.
 	; OutboundPermission = False
 
+[UserAgentService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your user agent server 
+    ;
+    UserAgentServerURI = "http://mygridserver.com:8002"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5142d90..d2cf898 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -24,12 +24,14 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
+	FriendsModule			= "HGFriendsModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
@@ -63,3 +65,12 @@
 
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
+
+[Messaging]
+	MessageTransferModule = HGMessageTransferModule
+
+[HGInstantMessageService]
+	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+	GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+	PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
\ No newline at end of file
-- 
cgit v1.1


From 07acb4d321d1388aeae7e789b59280dee8de63da Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 26 May 2011 19:15:39 -0700
Subject: Last commit before pushing. WARNING: (a) DB migration on the friends
 table; and (b) several config additions related to HG. See
 Robust.HG.ini.example, GridCommon.ini.example and/or
 StandaloneCommon.ini.example.

---
 bin/config-include/GridCommon.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index b2ecc79..486ba76 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -96,7 +96,7 @@
 [UserAgentService]
     ;
     ; === HG ONLY ===
-    ; Change this to your user agent server 
+    ; Change this to your user agent server (HG robust)
     ;
     UserAgentServerURI = "http://mygridserver.com:8002"
 
-- 
cgit v1.1


From 31d07859f9b073a8db080228192ce5303af54cd9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 26 May 2011 19:43:24 -0700
Subject: Added missing config vars to StandaloneCommon.ini.example and fixed
 the ones in Robust.HG.ini.example

---
 bin/config-include/StandaloneCommon.ini.example | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 67efa11..df93cee 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -82,6 +82,8 @@
     SRV_InventoryServerURI = "http://127.0.0.1:9000"
     SRV_AssetServerURI = "http://127.0.0.1:9000"
     SRV_ProfileServerURI = "http://127.0.0.1:9000"
+    SRV_FriendsServerURI = "http://127.0.0.1:9000"
+    SRV_IMServerURI = "http://127.0.0.1:9000"
 
 	;; Regular expressions for controlling which client versions are accepted/denied.
 	;; An empty string means nothing is checked.
-- 
cgit v1.1


From 36f9d55c363f0b6877a4eeb4a9d37ba989257393 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 27 May 2011 07:00:36 -0700
Subject: Added a BasicProfilemodule so that the profile-based actions (like
 give inventory, etc) work. This is just a mock profile, the same for all
 users, and with no DB backend behind it -- meaning that nothing will be
 saved. For serious profiles, use 3rd party implementations.

---
 bin/config-include/Grid.ini                | 3 +++
 bin/config-include/GridHypergrid.ini       | 2 ++
 bin/config-include/Standalone.ini          | 3 +++
 bin/config-include/StandaloneHypergrid.ini | 3 +++
 4 files changed, 11 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index ce5588e..baadbb8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,6 +27,9 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[Profiles]
+    Module = "BasicProfileModule"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d2cf898..72b7412 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -31,6 +31,8 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[Profiles]
+    Module = "BasicProfileModule"
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6355d09..cfcf5ed 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,9 @@
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
 
+[Profiles]
+    Module = "BasicProfileModule"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index cd2d7a7..7d1ff60 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -32,6 +32,9 @@
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
 
+[Profiles]
+    Module = "BasicProfileModule"
+
 [Messaging]
 	MessageTransferModule = HGMessageTransferModule
 
-- 
cgit v1.1


From 76525be7b2cb1a72c45a72801dac871c4a338bcb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 27 May 2011 13:07:18 -0700
Subject: HG lures working! Friends can offer friends HG teleports via the
 profile. WARNING: additional configuration for HG inis -- see
 *Common.ini.example

---
 bin/config-include/GridCommon.ini.example       | 6 ++++++
 bin/config-include/GridHypergrid.ini            | 3 ++-
 bin/config-include/StandaloneCommon.ini.example | 5 +++++
 bin/config-include/StandaloneHypergrid.ini      | 3 ++-
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 486ba76..29f0de3 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -46,6 +46,12 @@
 	;; Robust server in port 8002, but not always)
 	Gatekeeper="http://mygridserver.com:8002"
 
+[Messaging]
+    ;; change this to the address of your Gatekeeper service
+    ;; (usually bundled with the rest of the services in one 
+    ;; Robust server in port 8002, but not always)
+    Gatekeeper = "http://mygridserver.com:8002"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 72b7412..510a315 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -69,7 +69,8 @@
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 
 [Messaging]
-	MessageTransferModule = HGMessageTransferModule
+    MessageTransferModule = HGMessageTransferModule
+    LureModule = HGLureModule
 
 [HGInstantMessageService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index df93cee..931a77b 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -70,6 +70,11 @@
     ;; change this to the address of your simulator
     Gatekeeper="http://127.0.0.1:9000"
 
+[Messaging]
+    ; === HG ONLY ===
+    ;; change this to the address of your simulator
+    Gatekeeper = "http://127.0.0.1:9000"
+
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
     ;LibraryName = "My World's Library"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 7d1ff60..44ca3ac 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -36,7 +36,8 @@
     Module = "BasicProfileModule"
 
 [Messaging]
-	MessageTransferModule = HGMessageTransferModule
+    MessageTransferModule = HGMessageTransferModule
+    LureModule = HGLureModule
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
-- 
cgit v1.1


From 44d5821c4ebac350a1db72abe7fa6c6527892f57 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 27 May 2011 13:35:22 -0700
Subject: Fixed one comment in a config file.

---
 bin/config-include/GridCommon.ini.example | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 29f0de3..e022f1f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -47,6 +47,7 @@
 	Gatekeeper="http://mygridserver.com:8002"
 
 [Messaging]
+    ; === HG ONLY ===
     ;; change this to the address of your Gatekeeper service
     ;; (usually bundled with the rest of the services in one 
     ;; Robust server in port 8002, but not always)
-- 
cgit v1.1


From 7ea6dfecd9ede7f5f8ad169d9e6777404d97b164 Mon Sep 17 00:00:00 2001
From: Makopoppo
Date: Sat, 28 May 2011 12:07:23 +0900
Subject: Adding MSSQL connectionString example

---
 bin/config-include/GridCommon.ini.example       | 8 ++++++++
 bin/config-include/StandaloneCommon.ini.example | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e022f1f..c5c26ec 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -14,6 +14,14 @@
     ; Uncomment this line if you are using MySQL and want to use a different database for estates
     ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
 
+    ; MSSQL
+    ; Uncomment these lines if you want to use MSSQL storage
+    ; Change the connection string to your db details
+    ; The value for server property is shown in your SQL Server Management Studio login dialog.
+    ; (This sample is the default of express edition)
+    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
+    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
+
 [AssetService]
 
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 931a77b..57380ee 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -16,6 +16,14 @@
     ; Uncomment this line if you are using MySQL and want to use a different database for estates
     ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
+    ; MSSQL
+    ; Uncomment these lines if you want to use MSSQL storage
+    ; Change the connection string to your db details
+    ; The value for server property is shown in your SQL Server Management Studio login dialog.
+    ; (This sample is the default of express edition)
+    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
+    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
+
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-- 
cgit v1.1


From 46cdd442a8daebe5b1573f09cd5cef51c0b17874 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 1 Jun 2011 18:18:31 -0700
Subject: [Profiles] --> [Profile]

---
 bin/config-include/Grid.ini                | 2 +-
 bin/config-include/GridHypergrid.ini       | 2 +-
 bin/config-include/Standalone.ini          | 2 +-
 bin/config-include/StandaloneHypergrid.ini | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index baadbb8..5220573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,7 +27,7 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
-[Profiles]
+[Profile]
     Module = "BasicProfileModule"
 
 [SimulationDataStore]
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 510a315..b8e66c2 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -31,7 +31,7 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
-[Profiles]
+[Profile]
     Module = "BasicProfileModule"
 
 [SimulationDataStore]
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cfcf5ed..4ff1a26 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,7 +22,7 @@
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
 
-[Profiles]
+[Profile]
     Module = "BasicProfileModule"
 
 [SimulationDataStore]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 44ca3ac..574375e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -32,7 +32,7 @@
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
 
-[Profiles]
+[Profile]
     Module = "BasicProfileModule"
 
 [Messaging]
-- 
cgit v1.1


From dfa4442319397abd91e1ffbf61b02fb63b8f46d2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 2 Jun 2011 22:43:44 +0100
Subject: Move the "!!!Standalone Only!!!" [FreeswitchService] section from
 OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.

---
 bin/config-include/StandaloneCommon.ini.example | 36 +++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 57380ee..aeebcd0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -139,6 +139,42 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+[FreeswitchService]
+    ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
+    ;;
+    ;; The IP address of your FreeSWITCH server.  The common case is for this to be the same as the server running the OpenSim standalone
+    ;; This has to be set for the FreeSWITCH service to work
+    ;; This address must be reachable by viewers.
+    ;ServerAddress = 127.0.0.1
+
+    ;; The following configuration parameters are optional
+
+    ;; By default, this is the same as the ServerAddress
+    ; Realm = 127.0.0.1
+
+    ;; By default, this is the same as the ServerAddress on port 5060
+    ; SIPProxy = 127.0.0.1:5060
+
+    ;; Default is 5000ms
+    ; DefaultTimeout = 5000
+
+    ;; The dial plan context.  Default is "default"
+    ; Context = default
+
+    ;; Currently unused
+    ; UserName = freeswitch
+
+    ;; Currently unused
+    ; Password = password
+
+    ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
+    ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
+    ;; stun.freeswitch.org is not guaranteed to be running so use it in
+    ;; production at your own risk    
+    ; EchoServer = 127.0.0.1
+    ; EchoPort = 50505
+    ; AttemptSTUN = false
+
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
     ; Client launcher scripts and third-party clients make use of this to
-- 
cgit v1.1


From 7772640ae8041555c1f1098ed036c1c42944a108 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 3 Jun 2011 10:29:59 -0700
Subject: .ini.example's updated for HG Landmarks

---
 bin/config-include/GridCommon.ini.example       | 3 ++-
 bin/config-include/StandaloneCommon.ini.example | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index c5c26ec..e2e6459 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -100,10 +100,11 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your profile server 
+    ; Change this to your server 
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
+	Gatekeeper = "http://mygridserver.com:8002"
 	;; If you want to protect your assets from being copied by foreign visitors
 	;; uncomment the next line. You may want to do this on sims that have licensed content.
 	; OutboundPermission = False
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 57380ee..cda3ff8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -36,6 +36,7 @@
 
 [HGInventoryAccessModule]
     ProfileServerURI = "http://127.0.0.1:9000/profiles"
+	Gatekeeper = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
-- 
cgit v1.1


From f5d82350bb622baa6f49042882e6c5cb49b24cc0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 Jun 2011 10:51:12 -0700
Subject: This fixes the crash reported in
 http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to
 foreign friends who are offline. Hopefully.

---
 bin/config-include/StandaloneHypergrid.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 574375e..8480a77 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -160,6 +160,7 @@
 	GridService = "OpenSim.Services.GridService.dll:GridService"
 	PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+	InGatekeeper = True
 
 
 ;; This should always be the very last thing on this file
-- 
cgit v1.1