From 92d5b1560d0489b16b5a6c57df11429ff1caf66f Mon Sep 17 00:00:00 2001
From: diva
Date: Fri, 22 May 2009 22:48:25 +0000
Subject: Added a few pre-packaged configurations to make it easier for people
 to configure their sims.

---
 bin/config-include/Grid.ini                |  6 ++++++
 bin/config-include/GridCommon.ini          | 17 +++++++++++++++++
 bin/config-include/GridHypergrid.ini       | 10 ++++++++++
 bin/config-include/Standalone.ini          | 10 ++++++++++
 bin/config-include/StandaloneCommon.ini    | 21 +++++++++++++++++++++
 bin/config-include/StandaloneHypergrid.ini | 11 +++++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 bin/config-include/Grid.ini
 create mode 100644 bin/config-include/GridCommon.ini
 create mode 100644 bin/config-include/GridHypergrid.ini
 create mode 100644 bin/config-include/Standalone.ini
 create mode 100644 bin/config-include/StandaloneCommon.ini
 create mode 100644 bin/config-include/StandaloneHypergrid.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
new file mode 100644
index 0000000..7f9db1c
--- /dev/null
+++ b/bin/config-include/Grid.ini
@@ -0,0 +1,6 @@
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "RemoteAssetServicesConnector"
+
diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
new file mode 100644
index 0000000..0e95f35
--- /dev/null
+++ b/bin/config-include/GridCommon.ini
@@ -0,0 +1,17 @@
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 32768
+
+[AssetService]
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ;
+    ; change this to your grid-wide asset server
+    ;
+    AssetServerURI = "http://myassetserver.com:8003"
+
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
new file mode 100644
index 0000000..5a93b79
--- /dev/null
+++ b/bin/config-include/GridHypergrid.ini
@@ -0,0 +1,10 @@
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
new file mode 100644
index 0000000..c35cda9
--- /dev/null
+++ b/bin/config-include/Standalone.ini
@@ -0,0 +1,10 @@
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "LocalAssetServicesConnector"
+
+
+[AssetService]
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+
diff --git a/bin/config-include/StandaloneCommon.ini b/bin/config-include/StandaloneCommon.ini
new file mode 100644
index 0000000..a14c653
--- /dev/null
+++ b/bin/config-include/StandaloneCommon.ini
@@ -0,0 +1,21 @@
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 16384
+
+[AssetService]
+    ;
+    ;### Choose the DB
+    ;
+    ;--- For SQLite
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+    ;--- For MySql
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
new file mode 100644
index 0000000..eaee63d
--- /dev/null
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -0,0 +1,11 @@
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+
-- 
cgit v1.1


From 1be22bc626720a7c10b5efcbfe355638d79df47e Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 23 May 2009 01:40:03 +0000
Subject: Changing extension of two of the config files to .example because
 they need to be copied and customized.

---
 bin/config-include/GridCommon.ini               | 17 -----------------
 bin/config-include/GridCommon.ini.example       | 17 +++++++++++++++++
 bin/config-include/StandaloneCommon.ini         | 21 ---------------------
 bin/config-include/StandaloneCommon.ini.example | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 bin/config-include/GridCommon.ini
 create mode 100644 bin/config-include/GridCommon.ini.example
 delete mode 100644 bin/config-include/StandaloneCommon.ini
 create mode 100644 bin/config-include/StandaloneCommon.ini.example

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
deleted file mode 100644
index 0e95f35..0000000
--- a/bin/config-include/GridCommon.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 32768
-
-[AssetService]
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-    ;
-    ; change this to your grid-wide asset server
-    ;
-    AssetServerURI = "http://myassetserver.com:8003"
-
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
new file mode 100644
index 0000000..0e95f35
--- /dev/null
+++ b/bin/config-include/GridCommon.ini.example
@@ -0,0 +1,17 @@
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 32768
+
+[AssetService]
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ;
+    ; change this to your grid-wide asset server
+    ;
+    AssetServerURI = "http://myassetserver.com:8003"
+
diff --git a/bin/config-include/StandaloneCommon.ini b/bin/config-include/StandaloneCommon.ini
deleted file mode 100644
index a14c653..0000000
--- a/bin/config-include/StandaloneCommon.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 16384
-
-[AssetService]
-    ;
-    ;### Choose the DB
-    ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
new file mode 100644
index 0000000..a14c653
--- /dev/null
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -0,0 +1,21 @@
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 16384
+
+[AssetService]
+    ;
+    ;### Choose the DB
+    ;
+    ;--- For SQLite
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+    ;--- For MySql
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+
-- 
cgit v1.1


From c287c4c57ba77e00ac6722dae5c296608e5f3cf3 Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 23 May 2009 15:08:03 +0000
Subject: Added one missing config var for HG standalones.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index eaee63d..975132b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -6,6 +6,10 @@
 
 
 [AssetService]
+    ; For the RegionAssetService
+    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
+
+    ; For HGAssetBroker
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
 
-- 
cgit v1.1


From d4957dd9be8ef4484478510f5d3c6c974d3afe26 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 25 May 2009 01:59:50 +0000
Subject: Update svn properties.

---
 bin/config-include/Grid.ini                     | 12 +++----
 bin/config-include/GridCommon.ini.example       | 34 ++++++++++----------
 bin/config-include/GridHypergrid.ini            | 20 ++++++------
 bin/config-include/Standalone.ini               | 20 ++++++------
 bin/config-include/StandaloneCommon.ini.example | 42 ++++++++++++-------------
 bin/config-include/StandaloneHypergrid.ini      | 30 +++++++++---------
 6 files changed, 79 insertions(+), 79 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 7f9db1c..6a339f2 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,6 +1,6 @@
-[Includes]
-    Include-Common = "config-include/GridCommon.ini"
-
-[Modules]
-    AssetServices = "RemoteAssetServicesConnector"
-
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "RemoteAssetServicesConnector"
+
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0e95f35..de57c98 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,17 +1,17 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 32768
-
-[AssetService]
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-    ;
-    ; change this to your grid-wide asset server
-    ;
-    AssetServerURI = "http://myassetserver.com:8003"
-
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 32768
+
+[AssetService]
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ;
+    ; change this to your grid-wide asset server
+    ;
+    AssetServerURI = "http://myassetserver.com:8003"
+
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5a93b79..e21f306 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,10 +1,10 @@
-[Includes]
-    Include-Common = "config-include/GridCommon.ini"
-
-[Modules]
-    AssetServices = "HGAssetBroker"
-
-
-[AssetService]
-    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c35cda9..dd9fdb5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,10 +1,10 @@
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
-[Modules]
-    AssetServices = "LocalAssetServicesConnector"
-
-
-[AssetService]
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "LocalAssetServicesConnector"
+
+
+[AssetService]
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a14c653..001b3a0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,21 +1,21 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 16384
-
-[AssetService]
-    ;
-    ;### Choose the DB
-    ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 16384
+
+[AssetService]
+    ;
+    ;### Choose the DB
+    ;
+    ;--- For SQLite
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+    ;--- For MySql
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 975132b..a97ac7b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,15 +1,15 @@
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
-[Modules]
-    AssetServices = "HGAssetBroker"
-
-
-[AssetService]
-    ; For the RegionAssetService
-    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
-
-    ; For HGAssetBroker
-    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
-
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    ; For the RegionAssetService
+    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
+
+    ; For HGAssetBroker
+    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+
-- 
cgit v1.1


From e0ef6974022c035f5fe256f9b9d4f2815ffa300f Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 27 May 2009 16:11:23 +0000
Subject: Adding the GlynnTucker cache module as the default choice in .ini's.
 Minor log message change in the module itself.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index de57c98..8a95776 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,9 +1,10 @@
 [Modules]
-    AssetCaching = "CoreAssetCache"
+    ;AssetCaching = "CoreAssetCache"
+    AssetCaching = "GlynnTuckerAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
-    CacheBuckets = 32768
+    ;CacheBuckets = 32768
 
 [AssetService]
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 001b3a0..d607092 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,9 +1,10 @@
 [Modules]
-    AssetCaching = "CoreAssetCache"
+    ;AssetCaching = "CoreAssetCache"
+    AssetCaching = "GlynnTuckerAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
-    CacheBuckets = 16384
+    ;CacheBuckets = 16384
 
 [AssetService]
     ;
-- 
cgit v1.1


From b38be1a7fdf71a7d3c6d6f761590827b1f45483c Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Tue, 2 Jun 2009 22:42:47 +0000
Subject: Thank you Imaze Rhiano for a patch that implements Cenome Memory
 Asset Cache (Mantis #3759) See the files:
 bin/config-include/GridCommon.ini.example and
 bin/config-include/StandaloneCommon.ini.example to configure and enable this
 caching method.

---
 bin/config-include/GridCommon.ini.example       | 9 +++++++++
 bin/config-include/StandaloneCommon.ini.example | 8 ++++++++
 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 8a95776..d0f63c8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,6 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -16,3 +17,11 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
+
+    ; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d607092..d772256 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,6 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -20,3 +21,10 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 
+    ; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
\ No newline at end of file
-- 
cgit v1.1


From 528db433264053d2a0fca095aaa25db48c816eac Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Wed, 3 Jun 2009 02:03:11 +0000
Subject: revert r9765 due to too many errors on some compilers. Affects Mantis
 #3759

---
 bin/config-include/GridCommon.ini.example       | 9 ---------
 bin/config-include/StandaloneCommon.ini.example | 8 --------
 2 files changed, 17 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d0f63c8..8a95776 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,7 +1,6 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -17,11 +16,3 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
-
-    ; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d772256..d607092 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,7 +1,6 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -21,10 +20,3 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 
-    ; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
\ No newline at end of file
-- 
cgit v1.1


From 9e3b592fa3636cf3d50460e303173de55bcb3920 Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Wed, 3 Jun 2009 08:41:08 +0000
Subject: Thank you Imaze Rhiano for a patch that implements Cenome Memory
 Asset Cache (Mantis #3759) See the files:
 bin/config-include/GridCommon.ini.example and
 bin/config-include/StandaloneCommon.ini.example to configure and enable this
 caching method.

---
 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 8a95776..3825374 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,6 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -16,3 +17,10 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
+    ; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
\ No newline at end of file
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d607092..d772256 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,6 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
     AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
     ; Number of buckets for assets
@@ -20,3 +21,10 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 
+    ; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
\ No newline at end of file
-- 
cgit v1.1


From 99f3382c9c42140b27b8d58be0bbc2a7c11db812 Mon Sep 17 00:00:00 2001
From: diva
Date: Thu, 4 Jun 2009 18:36:02 +0000
Subject: Fixed placement of optional configs for CenomeAssetCache. Thank you
 ImazeR.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3825374..fb51c1f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -4,9 +4,18 @@
     ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
+    ;; Optional configurations for CoreAssetCache
     ; Number of buckets for assets
     ;CacheBuckets = 32768
 
+    ;; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
+
 [AssetService]
 
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
@@ -17,10 +26,3 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
-    ; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
\ No newline at end of file
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d772256..d03c003 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -4,9 +4,18 @@
     ;AssetCaching = "CenomeMemoryAssetCache"
 
 [AssetCache]
+    ;; Optional configurations for CoreAssetCache
     ; Number of buckets for assets
     ;CacheBuckets = 16384
 
+    ;; Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
+    
 [AssetService]
     ;
     ;### Choose the DB
@@ -20,11 +29,3 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-
-    ; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
\ No newline at end of file
-- 
cgit v1.1


From db9d3d3a90939b8b5d803271ca9e8040f49ea64e Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 6 Jun 2009 17:06:47 +0000
Subject: Added Flotsam's cache config vars to configuration. Made it the
 default in grided sims. Made Cenome cache the default in standalone sims.
 More splitting in ini files, invisible to the user.

---
 bin/config-include/Grid.ini                     |  1 +
 bin/config-include/GridCommon.ini.example       | 37 +++++++++++++++++--------
 bin/config-include/GridHypergrid.ini            |  1 +
 bin/config-include/StableSettings.ini           | 28 +++++++++++++++++++
 bin/config-include/Standalone.ini               |  1 +
 bin/config-include/StandaloneCommon.ini.example | 17 ++----------
 bin/config-include/StandaloneHypergrid.ini      |  1 +
 7 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 bin/config-include/StableSettings.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6a339f2..4f2e839 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fb51c1f..3eeec95 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,20 +1,35 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "GlynnTuckerAssetCache"
     ;AssetCaching = "CenomeMemoryAssetCache"
+    AssetCaching = "FlotsamAssetCache"
 
 [AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 32768
+    ;; ---- Optional configurations for FlotsamAssetCache
+    ;
+    ; The cache directory can be shared by multiple instances,
+    ; so you may want to change this! Note that you can 
+    ; specify an absolute path (starting with '/'). 
+    ; See examples in comments.
+    ; Make sure the directory you specify can be created.
+    ;
+    CacheDirectory = ./assetcache
+    ;
+    ; Some other examples:
+    ; CacheDirectory = /var/opensim/assetcache ; (Windows and linux)
+    ; CacheDirectory = ~/assetcache ; (Windows and linux)
+    ; CacheDirectory = C:\opensim\assetcache ; (Windows only)
+    
+    ;
+    ; How long {in hours} to keep assets cached on disk, 
+    ; .5 == 30 minutes; 168 = 7 days
+    ; Specify 0 if you do not want your disk cache to expire
+    ;
+    FileCacheTimeout = 168 
+    
+
+    ;; --------- endof FlotsamAssetCache --------
 
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
 
 [AssetService]
 
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e21f306..f22113b 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
new file mode 100644
index 0000000..5e3cbbc
--- /dev/null
+++ b/bin/config-include/StableSettings.ini
@@ -0,0 +1,28 @@
+[AssetCache]
+    ;; ---- Optional configurations for CoreAssetCache
+    ; Number of buckets for assets
+    ;CacheBuckets = 32768
+    ;; ---- endof CoreAssetCache ----------------
+
+    ;; ---- Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
+    ;; ---- endof CenomeMemoryAssetCache --------
+
+    ;; ---- Optional configurations for FlotsamAssetCache
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = true
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+
+    ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dd9fdb5..74c440e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d03c003..034d1e2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,20 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-
-[AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 16384
-
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
+    ;AssetCaching = "GlynnTuckerAssetCache"
+    AssetCaching = "CenomeMemoryAssetCache"
     
 [AssetService]
     ;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a97ac7b..7c5700e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
-- 
cgit v1.1


From 0356fef9abdabdc14b46188bad2074ef9963b32c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 8 Jun 2009 20:09:49 +0000
Subject: Updating the flotsam asset cache. Thank you, mcortez! Fixes Mantis
 #3784

---
 bin/config-include/GridCommon.ini.example | 53 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3eeec95..efbde56 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -3,33 +3,40 @@
     ;AssetCaching = "GlynnTuckerAssetCache"
     ;AssetCaching = "CenomeMemoryAssetCache"
     AssetCaching = "FlotsamAssetCache"
-
-[AssetCache]
-    ;; ---- Optional configurations for FlotsamAssetCache
-    ;
-    ; The cache directory can be shared by multiple instances,
-    ; so you may want to change this! Note that you can 
-    ; specify an absolute path (starting with '/'). 
-    ; See examples in comments.
-    ; Make sure the directory you specify can be created.
-    ;
-    CacheDirectory = ./assetcache
-    ;
-    ; Some other examples:
-    ; CacheDirectory = /var/opensim/assetcache ; (Windows and linux)
-    ; CacheDirectory = ~/assetcache ; (Windows and linux)
-    ; CacheDirectory = C:\opensim\assetcache ; (Windows only)
     
+[AssetCache]
+    ; cache directory can be shared by multiple instances
+    CacheDirectory = /directory/writable/by/OpenSim/instance
+
+    ; Log level
+    ; 0 - (Error) Errors only
+    ; 1 - (Info)  Hit Rate Stats + Level 0
+    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
     ;
-    ; How long {in hours} to keep assets cached on disk, 
-    ; .5 == 30 minutes; 168 = 7 days
-    ; Specify 0 if you do not want your disk cache to expire
-    ;
-    FileCacheTimeout = 168 
-    
+    LogLevel = 0
+
+    ; How often should hit rates be displayed (given in AssetRequests)
+    ; 0 to disable
+    HitRateDisplay = 100
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = true
 
-    ;; --------- endof FlotsamAssetCache --------
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
 
+    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
+    ; Specify 0 if you do not want your disk cache to expire
+    FileCacheTimeout = 0
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+    
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
+    ; long (in miliseconds) to block a request thread while trying to complete 
+    ; an existing write to disk.
+    ; WaitOnInprogressTimeout = 3000
 
 [AssetService]
 
-- 
cgit v1.1


From 0f367bd7bbc5d22d4834e1eb0f1671381485143e Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 10 Jun 2009 13:18:32 +0000
Subject: Heart surgery no.2: the inventory service hooks. Several improvements
 in the connectors themselves. Several improvements in configurations. Needed
 to add a hack in IUserService and UserManagerBase, to be removed when that
 service is refactored.

---
 bin/config-include/CenomeCache.ini.example      | 13 ++++++
 bin/config-include/FlotsamCache.ini.example     | 39 +++++++++++++++++
 bin/config-include/Grid.ini                     |  8 +++-
 bin/config-include/GridCommon.ini.example       | 58 ++++++++-----------------
 bin/config-include/GridHypergrid.ini            | 13 +++++-
 bin/config-include/StableSettings.ini           | 28 ------------
 bin/config-include/Standalone.ini               |  9 ++++
 bin/config-include/StandaloneCommon.ini.example | 21 ++++++---
 bin/config-include/StandaloneHypergrid.ini      | 15 ++++++-
 9 files changed, 126 insertions(+), 78 deletions(-)
 create mode 100644 bin/config-include/CenomeCache.ini.example
 create mode 100644 bin/config-include/FlotsamCache.ini.example
 delete mode 100644 bin/config-include/StableSettings.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
new file mode 100644
index 0000000..993fe64
--- /dev/null
+++ b/bin/config-include/CenomeCache.ini.example
@@ -0,0 +1,13 @@
+[AssetCache]
+    ;;
+    ;; Options for CenmoeAssetCache
+    ;;
+    
+    ; 256 MB (default: 134217728)
+    MaxSize =  268435456
+    
+    ; How many assets it is possible to store cache (default: 4096)
+    MaxCount = 16384
+    
+    ; Expiration time - 1 hour (default: 30 minutes)
+    ExpirationTime = 60
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
new file mode 100644
index 0000000..e9e43f6
--- /dev/null
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -0,0 +1,39 @@
+[AssetCache]
+    ;;
+    ;; Options for FlotsamAssetCache
+    ;;
+    
+    ; cache directory can be shared by multiple instances
+    CacheDirectory = ./assetcache
+    ; Other examples:
+    ;CacheDirectory = /directory/writable/by/OpenSim/instance
+
+    ; Log level
+    ; 0 - (Error) Errors only
+    ; 1 - (Info)  Hit Rate Stats + Level 0
+    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
+    ;
+    LogLevel = 0
+
+    ; How often should hit rates be displayed (given in AssetRequests)
+    ; 0 to disable
+    HitRateDisplay = 100
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = true
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+
+    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
+    ; Specify 0 if you do not want your disk cache to expire
+    FileCacheTimeout = 0
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+    
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
+    ; long (in miliseconds) to block a request thread while trying to complete 
+    ; an existing write to disk.
+    ; WaitOnInprogressTimeout = 3000
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4f2e839..68326b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,7 +1,13 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
-    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
+    InventoryServices = "RemoteInventoryServicesConnector"
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index efbde56..ff324ce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,43 +1,3 @@
-[Modules]
-    ;AssetCaching = "CoreAssetCache"
-    ;AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    AssetCaching = "FlotsamAssetCache"
-    
-[AssetCache]
-    ; cache directory can be shared by multiple instances
-    CacheDirectory = /directory/writable/by/OpenSim/instance
-
-    ; Log level
-    ; 0 - (Error) Errors only
-    ; 1 - (Info)  Hit Rate Stats + Level 0
-    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
-    ;
-    LogLevel = 0
-
-    ; How often should hit rates be displayed (given in AssetRequests)
-    ; 0 to disable
-    HitRateDisplay = 100
-
-    ; Set to false for disk cache only.
-    MemoryCacheEnabled = true
-
-    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    MemoryCacheTimeout = 2
-
-    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-    ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
-
-    ; How often {in hours} should the disk be checked for expired filed
-    ; Specify 0 to disable expiration checking
-    FileCleanupTimer = .166  ;roughly every 10 minutes
-    
-    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
-    ; long (in miliseconds) to block a request thread while trying to complete 
-    ; an existing write to disk.
-    ; WaitOnInprogressTimeout = 3000
-
 [AssetService]
 
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
@@ -48,3 +8,21 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
+[InventoryService]
+    ;
+    ; change this to your grid-wide asset server
+    ;
+    InventoryServerURI = "http://myassetserver.com:8004"
+
+
+[Modules]
+    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
+    ;; Copy the config .example file into your own .ini file and change configs there
+        
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
+
+    ;AssetCaching = "CenomeMemoryAssetCache"
+    ;Include-CenomeCache = "config-include/CenomeCache.ini"
+    
+    ;AssetCaching = "GlynnTuckerAssetCache"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f22113b..abac345 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,11 +1,20 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
-    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
-
+    InventoryServices = "HGInventoryBroker"
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+
+[InventoryService]
+    LocalGridInventoryService = "OpenSim.Services.Connectors.dll:InventoryServicesConnector"
+    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
deleted file mode 100644
index 5e3cbbc..0000000
--- a/bin/config-include/StableSettings.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[AssetCache]
-    ;; ---- Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 32768
-    ;; ---- endof CoreAssetCache ----------------
-
-    ;; ---- Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
-    ;; ---- endof CenomeMemoryAssetCache --------
-
-    ;; ---- Optional configurations for FlotsamAssetCache
-
-    ; Set to false for disk cache only.
-    MemoryCacheEnabled = true
-
-    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    MemoryCacheTimeout = 2
-
-    ; How often {in hours} should the disk be checked for expired filed
-    ; Specify 0 to disable expiration checking
-    FileCleanupTimer = .166  ;roughly every 10 minutes
-
-    ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 74c440e..a0cd098 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,11 +1,20 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in StandaloneCommon.ini.example,
+;; which you can copy and change.
+;;
+
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
     Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
+    InventoryServices = "LocalInventoryServicesConnector"
 
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
+[InventoryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 034d1e2..41112ef 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,9 +1,4 @@
-[Modules]
-    ;AssetCaching = "CoreAssetCache"
-    ;AssetCaching = "GlynnTuckerAssetCache"
-    AssetCaching = "CenomeMemoryAssetCache"
-    
-[AssetService]
+[DatabaseService]
     ;
     ;### Choose the DB
     ;
@@ -13,6 +8,20 @@
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
 
+[AssetService]
+
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
+
+[Modules]
+    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
+    ;; Copy the config .example file into your own .ini file and change configs there
+    
+    ;AssetCaching = "GlynnTuckerAssetCache"
+    
+    ;AssetCaching = "FlotsamAssetCache"
+    ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
+
+    AssetCaching = "CenomeMemoryAssetCache"
+    Include-CenomeCache = "config-include/CenomeCache.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 7c5700e..f962132 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,9 +1,15 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in StandaloneCommon.ini.example,
+;; which you can copy and change.
+;;
+
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
+    InventoryServices = "HGInventoryBroker"
 
 
 [AssetService]
@@ -14,3 +20,10 @@
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
 
+[InventoryService]
+    ; For the RegionInventoryService
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
+
+    ; For HGInventoryBroker
+    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
-- 
cgit v1.1


From 89219ab35a6a364969dcdffc13d0af5238416809 Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 10 Jun 2009 15:25:52 +0000
Subject: Flipping memory cache to false (default) in Flotsam cache, because of
 a bug in libomv.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index e9e43f6..8a49e3e 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -20,7 +20,7 @@
     HitRateDisplay = 100
 
     ; Set to false for disk cache only.
-    MemoryCacheEnabled = true
+    MemoryCacheEnabled = false
 
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
     MemoryCacheTimeout = 2
-- 
cgit v1.1


From 831264fc984dee0c97776db133472ccd2c58d1a3 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 10 Jun 2009 17:53:06 +0000
Subject: Thank you kindly, BlueWall, for a patch that solves: SQLite error on
 creating user.

---
 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 f962132..1b75ff7 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,6 +19,7 @@
     ; For HGAssetBroker
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    AssetServerURI = "http://localhost:8003"
 
 [InventoryService]
     ; For the RegionInventoryService
-- 
cgit v1.1


From 7f772d7a7dccb746ac4e63893de28fe5f1711bab Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 10 Jun 2009 18:43:03 +0000
Subject: Fixed problem in configuration for GridHypergrid.ini.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index abac345..30d520e 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -16,5 +16,5 @@
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
 
 [InventoryService]
-    LocalGridInventoryService = "OpenSim.Services.Connectors.dll:InventoryServicesConnector"
+    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
-- 
cgit v1.1


From e533f58733215cdb159724670cb383357bde851d Mon Sep 17 00:00:00 2001
From: diva
Date: Thu, 11 Jun 2009 01:50:52 +0000
Subject: Removed a change in StandaloneHypergrid.ini introduced in r9838,
 which was incorrect.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1b75ff7..f962132 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,7 +19,6 @@
     ; For HGAssetBroker
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
-    AssetServerURI = "http://localhost:8003"
 
 [InventoryService]
     ; For the RegionInventoryService
-- 
cgit v1.1


From 7a9c85526cb99495bdd436150679941ef021b782 Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 14 Jun 2009 15:35:09 +0000
Subject: Pulled out HelloNeighbour into its own service, INeighbourService,
 which may get more functions as we go along. It's a very simple service and
 service connectors, and it served primarily to establish the design of
 services that dependent on Scenes and that must always have a local
 connector. More refactoring coming, as this showed how to do it right.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 68326b8..f9ded41 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,4 +10,6 @@
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
     InventoryServices = "RemoteInventoryServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServiceInConnector = true
 
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 30d520e..fa3c4ed 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -10,6 +10,9 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServiceInConnector = true
+
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index a0cd098..c187358 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -6,12 +6,11 @@
 
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
-
+    NeighbourServices = "LocalNeighbourServicesConnector"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f962132..d8aec49 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,7 +10,7 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-
+    NeighbourServices = "LocalNeighbourServicesConnector"
 
 [AssetService]
     ; For the RegionAssetService
-- 
cgit v1.1


From 8d0eb3307fe665aed35209184ff4736e7c6170c4 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 14 Jun 2009 21:37:50 +0000
Subject: Update svn properties.

---
 bin/config-include/CenomeCache.ini.example  | 26 +++++-----
 bin/config-include/FlotsamCache.ini.example | 78 ++++++++++++++---------------
 2 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
index 993fe64..c7c901b 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/bin/config-include/CenomeCache.ini.example
@@ -1,13 +1,13 @@
-[AssetCache]
-    ;;
-    ;; Options for CenmoeAssetCache
-    ;;
-    
-    ; 256 MB (default: 134217728)
-    MaxSize =  268435456
-    
-    ; How many assets it is possible to store cache (default: 4096)
-    MaxCount = 16384
-    
-    ; Expiration time - 1 hour (default: 30 minutes)
-    ExpirationTime = 60
+[AssetCache]
+    ;;
+    ;; Options for CenmoeAssetCache
+    ;;
+    
+    ; 256 MB (default: 134217728)
+    MaxSize =  268435456
+    
+    ; How many assets it is possible to store cache (default: 4096)
+    MaxCount = 16384
+    
+    ; Expiration time - 1 hour (default: 30 minutes)
+    ExpirationTime = 60
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index 8a49e3e..e49b804 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -1,39 +1,39 @@
-[AssetCache]
-    ;;
-    ;; Options for FlotsamAssetCache
-    ;;
-    
-    ; cache directory can be shared by multiple instances
-    CacheDirectory = ./assetcache
-    ; Other examples:
-    ;CacheDirectory = /directory/writable/by/OpenSim/instance
-
-    ; Log level
-    ; 0 - (Error) Errors only
-    ; 1 - (Info)  Hit Rate Stats + Level 0
-    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
-    ;
-    LogLevel = 0
-
-    ; How often should hit rates be displayed (given in AssetRequests)
-    ; 0 to disable
-    HitRateDisplay = 100
-
-    ; Set to false for disk cache only.
-    MemoryCacheEnabled = false
-
-    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    MemoryCacheTimeout = 2
-
-    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-    ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
-
-    ; How often {in hours} should the disk be checked for expired filed
-    ; Specify 0 to disable expiration checking
-    FileCleanupTimer = .166  ;roughly every 10 minutes
-    
-    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
-    ; long (in miliseconds) to block a request thread while trying to complete 
-    ; an existing write to disk.
-    ; WaitOnInprogressTimeout = 3000
+[AssetCache]
+    ;;
+    ;; Options for FlotsamAssetCache
+    ;;
+    
+    ; cache directory can be shared by multiple instances
+    CacheDirectory = ./assetcache
+    ; Other examples:
+    ;CacheDirectory = /directory/writable/by/OpenSim/instance
+
+    ; Log level
+    ; 0 - (Error) Errors only
+    ; 1 - (Info)  Hit Rate Stats + Level 0
+    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
+    ;
+    LogLevel = 0
+
+    ; How often should hit rates be displayed (given in AssetRequests)
+    ; 0 to disable
+    HitRateDisplay = 100
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = false
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+
+    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
+    ; Specify 0 if you do not want your disk cache to expire
+    FileCacheTimeout = 0
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+    
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
+    ; long (in miliseconds) to block a request thread while trying to complete 
+    ; an existing write to disk.
+    ; WaitOnInprogressTimeout = 3000
-- 
cgit v1.1


From 380f59d0ffc3a1ec8cc20972b2475faf76f341fb Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 14 Jun 2009 23:00:23 +0000
Subject: Factoring out "land_data" / RequestLandData that was hanging off of
 IGridServices, erroneously. Not sure when this is used, but now it is
 implemented in the new model of service connectors. Hopefully it works.

---
 bin/config-include/Grid.ini          | 2 +-
 bin/config-include/GridHypergrid.ini | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index f9ded41..3b8f3a9 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,4 +12,4 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     NeighbourServiceInConnector = true
-
+    LandServiceInConnector = true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index fa3c4ed..4818fc8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -12,6 +12,7 @@
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     NeighbourServiceInConnector = true
+    LandServiceInConnector = true
 
 
 [AssetService]
-- 
cgit v1.1


From 54d44e370b1c6995a887e17823c9de645d1e72bb Mon Sep 17 00:00:00 2001
From: diva
Date: Mon, 15 Jun 2009 00:17:17 +0000
Subject: Removing the OpenSim.SimulatorServices project. All of those region
 modules are now in CoreModules/ServiceConnectorsIn, where they belong.

---
 bin/config-include/StandaloneHypergrid.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index d8aec49..a21251c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -11,9 +11,11 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "LocalNeighbourServicesConnector"
+    InventoryServiceInConnector = true
+    AssetServiceInConnector = true
 
 [AssetService]
-    ; For the RegionAssetService
+    ; For the AssetServiceInConnector
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
 
     ; For HGAssetBroker
@@ -21,7 +23,7 @@
     HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
 
 [InventoryService]
-    ; For the RegionInventoryService
+    ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
 
     ; For HGInventoryBroker
-- 
cgit v1.1


From e1fd76ace627dcef3798ca20f330397c93e13151 Mon Sep 17 00:00:00 2001
From: diva
Date: Mon, 15 Jun 2009 23:29:00 +0000
Subject: Moving these nice HG connectors to their homes.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4818fc8..8b65ab8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,8 +17,8 @@
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
-    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a21251c..8607e00 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,7 +20,7 @@
 
     ; For HGAssetBroker
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
     ; For the InventoryServiceInConnector
@@ -28,4 +28,4 @@
 
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
-- 
cgit v1.1


From ce7de3581cd678dd09227bdfde94fefb779f5a86 Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 17 Jun 2009 03:52:39 +0000
Subject: Implementation of a simple authentication service + in connector in
 route to making HGInventory (client access) work in standalone again. This is
 the refactoring of what was/is there, but done in the new model. Not complete
 yet, but key authentication works. It should be enough to make HGInventory
 work again soon.

---
 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 8607e00..6359ac0 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -13,6 +13,7 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
+    HGAuthServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -29,3 +30,7 @@
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[AuthenticationService]
+    ; For the HGAuthServiceInConnector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
\ No newline at end of file
-- 
cgit v1.1


From 148e2d55fa4dcf6e87ffce5c67f2ca2ea9e88a08 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 10 Jul 2009 18:40:37 +0000
Subject: * minor: Make GridCommon.ini.example refer to inventory service
 rather than asset where appropriate * Send debug level notice to console if a
 user fails authentication

---
 bin/config-include/GridCommon.ini.example | 5 +++--
 1 file changed, 3 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 ff324ce..3a8ec35 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -8,11 +8,12 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
+
 [InventoryService]
     ;
-    ; change this to your grid-wide asset server
+    ; change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://myassetserver.com:8004"
+    InventoryServerURI = "http://myinventoryserver.com:8004"
 
 
 [Modules]
-- 
cgit v1.1


From cbeebc209d47f9e2498cae8c25884282cb7f9aa2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 29 Jul 2009 17:21:36 +0000
Subject: Thank you, coyled, for a patch to change Flotsamcache path generation
 to avoid directory overflow.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index e49b804..feb3897 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -37,3 +37,14 @@
     ; long (in miliseconds) to block a request thread while trying to complete 
     ; an existing write to disk.
     ; WaitOnInprogressTimeout = 3000
+
+    ; Number of tiers to use for cache directories (current valid
+    ; range 1 to 3)
+    ;CacheDirectoryTiers = 1
+
+    ; Number of letters per path tier, 1 will create 16 directories
+    ; per tier, 2 - 256, 3 - 4096 and 4 - 65K
+    ;CacheDirectoryTierLength = 3
+
+    ; Warning level for cache directory size
+    ;CacheWarnAt = 30000
-- 
cgit v1.1


From ba5363042fc4dada5c88dc20783539776bd8daad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 4 Aug 2009 04:40:22 +0100
Subject: Configuration examples for the freeswitch module

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 41112ef..7ee81c0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -25,3 +25,9 @@
 
     AssetCaching = "CenomeMemoryAssetCache"
     Include-CenomeCache = "config-include/CenomeCache.ini"
+
+    ;; Enable this to use Freeswitch on a standalone
+    ;FreeswitchServiceInConnector = True
+
+[FreeswitchService]
+    ;; Configuration for the freeswitch service goes here
-- 
cgit v1.1


From 616a09f3594258cf55b3c8f2ca3dcbf7fcda1a04 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 4 Aug 2009 04:47:47 +0100
Subject: Update config examples

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 7ee81c0..bac7983 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -31,3 +31,4 @@
 
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
+    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
-- 
cgit v1.1


From 5bed0ba09b6dcbc891374a2448cafc3e6baafe49 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Aug 2009 21:43:24 +0100
Subject: Add optimization comment suggestions for FlotsamCache
 MemoryCacheTimeout as suggested by Whitestar.  Thanks!

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index feb3897..abb3b9a 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -23,6 +23,8 @@
     MemoryCacheEnabled = false
 
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
+    ; increases performance without large memory impact
     MemoryCacheTimeout = 2
 
     ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-- 
cgit v1.1


From 16940097beee0fad554dfcb7249294ff8ac247d4 Mon Sep 17 00:00:00 2001
From: Rob Smart
Date: Wed, 9 Sep 2009 19:42:53 +0100
Subject: The stubs for an authorization service, at the moment the service
 will always grant access to an avatar entering the region if requested.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c187358..24020b6 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -11,9 +11,13 @@
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    
+[AuthorizationService]
+    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-- 
cgit v1.1


From 953ef780c5858b70b3b2da551640c93105feb12c Mon Sep 17 00:00:00 2001
From: Rob Smart
Date: Thu, 10 Sep 2009 16:13:18 +0100
Subject: adding in working functionality for the remote connector

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 3b8f3a9..10f7dbd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,6 +10,7 @@
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
     InventoryServices = "RemoteInventoryServicesConnector"
+    AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-- 
cgit v1.1


From ce332f235ccc5168cfc44834e16318497c67cdd7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 10 Sep 2009 19:56:08 -0700
Subject: Changed the interface of IAuthorizationService to get less data.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 6359ac0..aa122be 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -11,6 +11,7 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "LocalNeighbourServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -31,6 +32,11 @@
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
+[AuthorizationService]
+    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+
 [AuthenticationService]
     ; For the HGAuthServiceInConnector
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
\ No newline at end of file
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
+    
+    
\ No newline at end of file
-- 
cgit v1.1


From 35deff7ec4df6156abccdbeed83b14a6083e28f9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 09:27:01 -0700
Subject: Modules active. Tested HGGridConnector in standalone only for now.
 Modules commands work.

---
 bin/config-include/Standalone.ini          | 5 +++++
 bin/config-include/StandaloneHypergrid.ini | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..69c60ee 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "LocalGridServicesConnector"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
     
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+
+[GridService]
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be..24b0f26 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,9 +12,11 @@
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "HGGridServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
+    HypergridServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -39,4 +41,7 @@
     ; For the HGAuthServiceInConnector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
-    
\ No newline at end of file
+[GridService]
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector"
+	StorageProvider = "OpenSim.Data.Null.dll"
\ No newline at end of file
-- 
cgit v1.1


From 67276589c883fe1a74d8d52057db1431d637dade Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 17:20:07 -0700
Subject: Changed IGridService to use the new GridRegion data structure instead
 of old SimpleRegionInfo. Added grid configs to standalones.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 69c60ee..5a5cbff 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,4 +25,5 @@
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 	
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 24b0f26..b14517d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -43,5 +43,5 @@
     
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector"
-	StorageProvider = "OpenSim.Data.Null.dll"
\ No newline at end of file
+	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
\ No newline at end of file
-- 
cgit v1.1


From ae222140ca6984750f53716088b6df165d8a35e5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 10:08:59 -0700
Subject: Finished spec-ing the .inis for the new grid service modules.

---
 bin/config-include/Grid.ini                     |  7 +++++++
 bin/config-include/GridCommon.ini.example       |  5 +++++
 bin/config-include/GridHypergrid.ini            | 11 ++++++++++-
 bin/config-include/Standalone.ini               |  3 +--
 bin/config-include/StandaloneCommon.ini.example |  7 +++++++
 bin/config-include/StandaloneHypergrid.ini      |  6 ++++--
 6 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+
+[GridService]
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..2724c42 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
     ;
     InventoryServerURI = "http://myinventoryserver.com:8004"
 
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "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 8b65ab8..1bfcf89 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -11,9 +11,10 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-
+    HypergridServiceInConnector = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +23,11 @@
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+	; which in turn uses this
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 5a5cbff..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-	
\ No newline at end of file
+    Realm = "regions"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+[GridService]
+    ;; For in-memory region storage (default)
+	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+ 	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index b14517d..793f4d5 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,6 +42,8 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
 [GridService]
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the HGGridServicesConnector to instantiate
 	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
\ No newline at end of file
+	; LocalGridServicesConnector needs this
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	Realm = "regions"
-- 
cgit v1.1


From 368ae02dc9f7786545342d7bffae5de28678e85f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 10:18:22 -0700
Subject: Corrected the port number to 8001 in the test client and grid ini.

---
 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 2724c42..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -19,7 +19,7 @@
     ;
     ; change this to your grid-wide inventory server
     ;
-    GridServerURI = "http://mygridserver.com:8002"
+    GridServerURI = "http://mygridserver.com:8001"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-- 
cgit v1.1


From 8b2b8801e63fbcf5252e5ddbb40438e224025348 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 27 Sep 2009 14:32:03 -0700
Subject: Fixed port in GridServer.ini. Added new configs for
 StandaloneHypergrid.ini

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 793f4d5..75cdad9 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,13 +10,15 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
+
 
 [AssetService]
     ; For the AssetServiceInConnector
-- 
cgit v1.1


From b1d204802fa1c07e3b00d0b363346673b763d67b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 29 Sep 2009 16:13:07 -0700
Subject: Minor bug fixes.

---
 bin/config-include/GridHypergrid.ini       | 3 +++
 bin/config-include/StandaloneHypergrid.ini | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1bfcf89..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,6 +7,9 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
+[Startup]
+	hypergrid = true
+
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 75cdad9..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,6 +7,9 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
 
+[Startup]
+	hypergrid = true
+	
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-- 
cgit v1.1


From e1112ff879659bba3b51a22eee150d20d6090769 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Oct 2009 08:46:06 -0700
Subject: MOre streams closed. Corrected word in GridCommon.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 e9d3728..6607a1a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -17,7 +17,7 @@
 
 [GridService]
     ;
-    ; change this to your grid-wide inventory server
+    ; change this to your grid-wide grid server
     ;
     GridServerURI = "http://mygridserver.com:8001"
 
-- 
cgit v1.1


From 46110b0195c513327c1c6f1bf7db1908f370a45e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Oct 2009 20:18:35 +0100
Subject: change default ports for inventory and grid connectors in example
 .ini files to 8003 to match the ROBUST default altered wiki page to reflect
 this

---
 bin/config-include/GridCommon.ini.example | 4 ++--
 1 file changed, 2 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 6607a1a..3bc9b6c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -13,13 +13,13 @@
     ;
     ; change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://myinventoryserver.com:8004"
+    InventoryServerURI = "http://myinventoryserver.com:8003"
 
 [GridService]
     ;
     ; change this to your grid-wide grid server
     ;
-    GridServerURI = "http://mygridserver.com:8001"
+    GridServerURI = "http://mygridserver.com:8003"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-- 
cgit v1.1


From 36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 11 Oct 2009 10:23:16 -0700
Subject: * Changed logic of enabling LLProxyLoginModule to follow the new
 style -- true/false on the name, rather than gridmode=true. * Better error
 messages on Add/Remove clients.

---
 bin/config-include/Grid.ini          | 1 +
 bin/config-include/GridHypergrid.ini | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 261c1b8..5b19130 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -15,6 +15,7 @@
     GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+    LLProxyLoginModule = true
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f5aa603..a5fe6e9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -18,6 +18,7 @@
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
     HypergridServiceInConnector = true
+    LLProxyLoginModule = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-- 
cgit v1.1


From bf68dad64398f7bd4ae2992d345071d261c32e80 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Oct 2009 23:21:32 +0100
Subject: 0004246: [Patch] FlotsamAssetCache deep scan & cache Thank you,
 mcortez.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index abb3b9a..b50d7ec 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -50,3 +50,10 @@
 
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
+	
+	; Perform a deep scan of all assets within all regions, looking for all assets
+	; present or referenced.  Mark all assets found that are already present in the
+	; cache, and request all assets that are found that are not already cached (this
+	; will cause those assets to be cached)
+	;
+	; DeepScanBeforePurge = false
-- 
cgit v1.1


From 2a886fd76c9df972fa3096d19b37047f7eda672f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 21 Oct 2009 02:19:45 +0100
Subject: Really make module port selection work. Implement port setting in
 LLProxyLoginModule.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3bc9b6c..6da0f1e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -32,3 +32,7 @@
     ;Include-CenomeCache = "config-include/CenomeCache.ini"
     
     ;AssetCaching = "GlynnTuckerAssetCache"
+
+    ;; Optionally, the port for the LLProxyLoginModule module can be changed
+    
+    ;Setup_LLProxyLoginModule = "9090/"
-- 
cgit v1.1


From 1fa938aab0b748768ff3528e41ba76dd6baa1bf3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Dec 2009 17:31:30 -0800
Subject: Library Module: allows adding folders/items to the Library from IAR
 files placed under bin/Library. This works only for standalones.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index a6c089c..cdfdf4b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,7 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    LibraryModule = true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -26,3 +27,4 @@
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
+
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index b0e2de3..1679f93 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,3 +39,7 @@
     ;;--- For MySql region storage (alternative)
  	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+[LibraryModule]
+    ; Set this if you want to change the name of the OpenSim Library
+    ;LibraryName = "My World's Library"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index baff811..909286c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -21,7 +21,7 @@
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
-
+    LibraryModule = true
 
 [AssetService]
     ; For the AssetServiceInConnector
-- 
cgit v1.1


From f43a64805251dfbb2e24abc481b8b59c062d452e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Dec 2009 09:22:35 -0800
Subject: * Added the new modules to Resources, making them active. * Added
 their configs to standalone for testing. This crashes, because the DB is
 still not ready.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..c4cffb9 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,7 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    PresenceServices ="LocalPresenceServicesConnector"
     LibraryModule = true
 
 [AssetService]
@@ -28,3 +29,5 @@
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
 
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..bd9de33 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -16,6 +16,7 @@
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
+    PresenceServices ="LocalPresenceServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -52,3 +53,6 @@
 	; LocalGridServicesConnector needs this
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
+
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-- 
cgit v1.1


From 88d2df597e499600357c86ad0b1a755a13e9c6b1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 29 Dec 2009 16:34:02 -0800
Subject: * Fixed names. * Added configs for Standalone * Changed
 UserSericeBase to use useraccounts instead of user

---
 bin/config-include/Standalone.ini          | 6 +++++-
 bin/config-include/StandaloneHypergrid.ini | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c4cffb9..3eb68a0 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,7 +13,8 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
-    PresenceServices ="LocalPresenceServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
     LibraryModule = true
 
 [AssetService]
@@ -31,3 +32,6 @@
 
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index bd9de33..4efc301 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -16,7 +16,8 @@
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
-    PresenceServices ="LocalPresenceServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -56,3 +57,6 @@
 
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
-- 
cgit v1.1


From be2f0336269e36fd987392209c8d5bf382a043f5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 29 Dec 2009 17:21:16 -0800
Subject: More renames to make everything consistent. This is the
 UserAccountService.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3eb68a0..e881e30 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -34,4 +34,4 @@
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [UserAccountService]
-    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 4efc301..c3ed754 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -59,4 +59,4 @@
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [UserAccountService]
-    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-- 
cgit v1.1


From b29ae7246076126e8e39827564438db6e53eac8a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 30 Dec 2009 21:00:16 -0800
Subject: First pass at the new login service. Still incomplete, but doesn't
 disrupt the existing code.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index c3ed754..7b1d43d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -60,3 +60,11 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    
-- 
cgit v1.1


From 1387919c204eb66ab6a37eb0fdf0f3c38f0a6813 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 31 Dec 2009 20:51:35 -0800
Subject: Yes! First test of new login service done still in 2009! Bombs in
 auth, because the data migration is missing. Will fix it next year... * HAPPY
 NEW YEAR!

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 7b1d43d..ac514ba 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -24,6 +24,7 @@
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
     LibraryModule = true
+    LLLoginServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -62,7 +63,7 @@
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLoginService.dll:LLLoginService"
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-- 
cgit v1.1


From 4240f2dec6f7348a99aea0d1b040fca6ea9d493b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 1 Jan 2010 16:54:24 -0800
Subject: New LL login service is working! -- tested in standalone only. Things
 still missing from response, namely Library and Friends. Appearance service
 is also missing.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ac514ba..6a9c3bf 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -14,6 +14,7 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
@@ -46,8 +47,7 @@
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
-    ; For the HGAuthServiceInConnector
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     
 [GridService]
     ; for the HGGridServicesConnector to instantiate
@@ -68,4 +68,5 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
     
-- 
cgit v1.1


From ec53301e637b479edc00526d3d946814f63a02d1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 1 Jan 2010 18:59:54 -0800
Subject: Forgotten modules in prior commit.

---
 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 6a9c3bf..96c25e6 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -70,3 +70,6 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     
+    DefaultRegion = "OpenSim Test"
+    WelcomeMessage = "Welcome, Avatar!"
+    
-- 
cgit v1.1


From 8a9677a5319793ff630d0761e204ae8961f375aa Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 1 Jan 2010 21:12:46 -0800
Subject: The Library Service is now working.
 UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to
 avoid merge conflicts later -- want to stay out of core as much as possible.

---
 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 96c25e6..d89029f 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -43,6 +43,11 @@
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
+[LibraryService]
+	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+	LibraryName = "OpenSim Library"
+	DefaultLibrary = "./inventory/Libraries.xml"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
-- 
cgit v1.1


From c268e342d19b6cc5969b1c1d94f20a3f4eb844ef Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 3 Jan 2010 09:35:12 -0800
Subject: * Changed ISimulation interface to take a GridRegion as input arg
 instead of a regionHandle. * Added the RemoteSimulationConnectorModule, which
 is the replacement for RESTComms. Scenes is not using this yet, only
 (standalone) Login uses these region modules for now. * Completed
 SimulationServiceConnector and corresponding handlers.

---
 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 d89029f..5e54cde 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,6 +19,7 @@
     GridServices = "HGGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
-- 
cgit v1.1


From 99efa99585639c94fdb484681663ac7b6f03538e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 3 Jan 2010 11:44:57 -0800
Subject: Successfully logged into a grid.

---
 bin/config-include/GridCommon.ini.example | 18 ++++++++++++++++++
 bin/config-include/GridHypergrid.ini      | 19 ++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..6a65523 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,24 @@
     ;
     GridServerURI = "http://mygridserver.com:8003"
 
+[PresenceService]
+    ;
+    ; change this to your grid-wide presence server
+    ;
+    PresenceServerURI = "http://mygridserver.com:8003"
+
+[UserAccountService]
+    ;
+    ; change this to your grid-wide user accounts server
+    ;
+    UserAccountServerURI = "http://mygridserver.com:8003"
+
+[AuthenticationService]
+    ;
+    ; change this to your grid-wide authentication server
+    ;
+    AuthenticationServerURI = "http://mygridserver.com:8003"
+
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..94b9f69 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,12 +13,21 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
     GridServices = "HGGridServicesConnector"
-    NeighbourServiceInConnector = true
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
     LandServiceInConnector = true
+    NeighbourServiceInConnector = true
     HypergridServiceInConnector = true
-    LLProxyLoginModule = true
+    SimulationServiceInConnector = true
+    InventoryServiceInConnector = false
+    AssetServiceInConnector = false
+    LibraryModule = false
+    LLLoginServiceInConnector = false
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -30,8 +39,8 @@
 
 [GridService]
     ; for the HGGridServicesConnector to instantiate
-	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+    GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
 	; which in turn uses this
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-- 
cgit v1.1


From add8d5df4cbcb3301860fdabc3691232bbe598be Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 3 Jan 2010 20:06:06 -0800
Subject: Config for non-HG grided sims.

---
 bin/config-include/Grid.ini | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..0cc7f92 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,18 @@
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
     InventoryServices = "RemoteInventoryServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
     GridServices = "RemoteGridServicesConnector"
-    NeighbourServiceInConnector = true
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthorizationServices = "RemoteAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
     LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
 
 [GridService]
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-	; for the LocalGridServicesConnector which is used by the Remote one
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     
\ No newline at end of file
-- 
cgit v1.1


From 1ac36bb5d9e6e67c2b157264aeeb397b9a1b55fd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 4 Jan 2010 07:45:20 -0800
Subject: Forgot to add these to the grid configs, so that logins work.

---
 bin/config-include/Grid.ini          | 5 ++++-
 bin/config-include/GridHypergrid.ini | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 0cc7f92..ef8008c 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -24,4 +24,7 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    
\ No newline at end of file
+    
+; Temporary...
+[Communications]
+    InterregionComms = "LocalComms"
\ No newline at end of file
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 94b9f69..512e88f 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,3 +44,7 @@
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+; Temporary...
+[Communications]
+    InterregionComms = "LocalComms"
\ No newline at end of file
-- 
cgit v1.1


From 96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 9 Jan 2010 18:04:50 -0800
Subject: * Added SetPassword to IAuthenticationService. * Added create user
 command to UserAccountService. Works. * Deleted create user command from
 OpenSim.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 5e54cde..feca115 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -67,7 +67,11 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    
+    ;; These are for creating new accounts
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-- 
cgit v1.1


From 6998668bbcf6479f0ea0728024f24666c8cb0f8a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 14:12:03 -0800
Subject: * Last reference to CommsManager.UserProfileCacheService removed *
 Grided-sims added the Library module

---
 bin/config-include/Grid.ini          | 2 ++
 bin/config-include/GridHypergrid.ini | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

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]
-- 
cgit v1.1


From 4dd523b45d1e635c66eb4e556764fabe29dbfc58 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 15:34:56 -0800
Subject: * Changed IPresenceService Logout, so that it takes a position and a
 lookat * CommsManager.AvatarService rerouted

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index e881e30..bf3237b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -15,7 +15,9 @@
     GridServices = "LocalGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "LocalSimulationConnectorModule"
     LibraryModule = true
+    LLLoginServiceInConnector = true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -23,6 +25,11 @@
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
     
+[LibraryService]
+	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+	LibraryName = "OpenSim Library"
+	DefaultLibrary = "./inventory/Libraries.xml"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
@@ -35,3 +42,18 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ;; These are for creating new accounts
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    
+    DefaultRegion = "OpenSim Test"
+    WelcomeMessage = "Welcome, Avatar!"
-- 
cgit v1.1


From 77e43f480154b0a950d9d5f54df5c225fc64e77a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 11 Jan 2010 17:30:05 -0800
Subject: Fixed a couple of bugs with Appearance. Appearance is all good now.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index feca115..277d05a 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,6 +20,7 @@
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector";
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -44,6 +45,10 @@
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
+[AvatarService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+
 [LibraryService]
 	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
 	LibraryName = "OpenSim Library"
@@ -79,6 +84,7 @@
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     
     DefaultRegion = "OpenSim Test"
     WelcomeMessage = "Welcome, Avatar!"
-- 
cgit v1.1


From 66920a9047b54db947d02f252e17409b7fc32ef0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 12 Jan 2010 09:22:58 -0800
Subject: Fixed more appearance woes that showed up using remote connectors.
 Appearance is now being passed with AgentCircuitData, as it should be.

---
 bin/config-include/GridHypergrid.ini | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5dadace..a64fa37 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,7 +44,3 @@
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-
-; Temporary...
-[Communications]
-    InterregionComms = "LocalComms"
\ No newline at end of file
-- 
cgit v1.1


From fa272e752189655b039a027d12fcc21b9d177bcb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 09:44:20 -0800
Subject: Updated configs.

---
 bin/config-include/Grid.ini               | 8 +++++---
 bin/config-include/GridCommon.ini.example | 6 ++++++
 bin/config-include/GridHypergrid.ini      | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index ebddfd5..6bf493b 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,6 +12,7 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     GridServices = "RemoteGridServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
@@ -27,6 +28,7 @@
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     
-; Temporary...
-[Communications]
-    InterregionComms = "LocalComms"
\ No newline at end of file
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6a65523..4d94ccd 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,12 @@
     ;
     GridServerURI = "http://mygridserver.com:8003"
 
+[AvatarService]
+    ;
+    ; change this to your grid-wide grid server
+    ;
+    AvatarServerURI = "http://mygridserver.com:8003"
+
 [PresenceService]
     ;
     ; change this to your grid-wide presence server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a64fa37..1a68362 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,3 +44,8 @@
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
-- 
cgit v1.1


From d939668d6a54bb25cbc56ec840058c08992fe536 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 10:15:14 -0800
Subject: Bug fix in create user: create inventory was missing.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 277d05a..a3e0547 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -72,10 +72,11 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ;; These are for creating new accounts
+    ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-- 
cgit v1.1


From 14ab9b04c4883f75ccae0225c91429e39af14991 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 15:28:46 -0800
Subject: LL Login now uses default regions if the desired start location is
 not found.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1679f93..ea03bed 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,6 +39,11 @@
     ;;--- For MySql region storage (alternative)
  	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;; Next, we can specify properties of regions, including default and fallback regions
+    ;; The syntax is: Region_<RegioName> = "<flags>"
+    ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;; For example:
+    Region_WelcomeArea = "DefaultRegion, FallbackRegion"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
-- 
cgit v1.1


From 283ff593b127bea95f276b430a3e6bf43b9a1625 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 18:30:33 -0800
Subject: Make use of Fallback regions when the desired start region is having
 problems.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ea03bed..0d54b4d 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -43,7 +43,7 @@
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
     ;; For example:
-    Region_WelcomeArea = "DefaultRegion, FallbackRegion"
+    Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
-- 
cgit v1.1


From daa9866a9adf591c6b32f992d189f6a1189a1677 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 19:25:33 -0800
Subject: Omit AuthorizationService from the default configurations, because
 the service doesn't exist in the distribution.

---
 bin/config-include/Grid.ini                | 1 -
 bin/config-include/GridHypergrid.ini       | 1 -
 bin/config-include/StandaloneHypergrid.ini | 1 -
 3 files changed, 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6bf493b..27e5cfb 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -13,7 +13,6 @@
     GridServices = "RemoteGridServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1a68362..3089598 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -16,7 +16,6 @@
     GridServices = "HGGridServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a3e0547..682170c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -15,7 +15,6 @@
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "LocalAuthenticationServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
-- 
cgit v1.1


From f5fb14ff52f2088d5a489cef69edb5a675e067f7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 19:57:41 -0800
Subject: * Added the missing AvatarServices module.

---
 bin/config-include/Grid.ini          | 1 +
 bin/config-include/GridHypergrid.ini | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 27e5cfb..4892306 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -11,6 +11,7 @@
     AssetServices = "RemoteAssetServicesConnector"
     InventoryServices = "RemoteInventoryServicesConnector"
     GridServices = "RemoteGridServicesConnector"
+    AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 3089598..9077e73 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -14,6 +14,7 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     GridServices = "HGGridServicesConnector"
+    AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
-- 
cgit v1.1


From f1c30784ac767bf5f62e81748984b76d85d71f6a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 15 Jan 2010 15:11:58 -0800
Subject: * General cleanup of Teleports, Crossings and Child agents. They are
 now in the new AgentTransferModule, in line with what MW started implementing
 back in May -- ITeleportModule. This has been renamed IAgentTransferModule,
 to be more generic. * HGSceneCommunicationService has been deleted *
 SceneCommunicationService will likely be deleted soon too

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4892306..1a9ac72 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -17,6 +17,7 @@
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
+    AgentTransferModule = "AgentTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 9077e73..1275a60 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -20,6 +20,7 @@
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
+    AgentTransferModule = "AgentTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     HypergridServiceInConnector = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf3237b..c9d483b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -16,6 +16,7 @@
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "LocalSimulationConnectorModule"
+    AgentTransferModule = "AgentTransferModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 682170c..20c5d10 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,7 +19,8 @@
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector";
+    AvatarServices = "LocalAvatarServicesConnector"
+    AgentTransferModule = "AgentTransferModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
-- 
cgit v1.1


From bd6d1a24448dafea5be7ddbcd591b352040e4412 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 16 Jan 2010 07:46:07 -0800
Subject: Moved prim crossing to EntityTransferModule. Not complete yet.

---
 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 1a9ac72..5aae1bc 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -17,7 +17,7 @@
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
-    AgentTransferModule = "AgentTransferModule"
+    EntityTransferModule = "BasicEntityTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1275a60..4b6bc17 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -20,7 +20,7 @@
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
-    AgentTransferModule = "AgentTransferModule"
+    EntityTransferModule = "BasicEntityTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     HypergridServiceInConnector = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c9d483b..452b9e9 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -16,7 +16,7 @@
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "LocalSimulationConnectorModule"
-    AgentTransferModule = "AgentTransferModule"
+    EntityTransferModule = "BasicEntityTransferModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 20c5d10..7f44bb7 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,7 +20,7 @@
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     AvatarServices = "LocalAvatarServicesConnector"
-    AgentTransferModule = "AgentTransferModule"
+    EntityTransferModule = "BasicEntityTransferModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
-- 
cgit v1.1


From 04e29c1bacbc1e2df980ae15896a847ce7535da2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 16 Jan 2010 21:42:44 -0800
Subject: Beginning of rewriting HG. Compiles, and runs, but HG functions not
 restored yet.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 7f44bb7..cd09091 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -63,9 +63,22 @@
 [GridService]
     ; for the HGGridServicesConnector to instantiate
 	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+	HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
 	; LocalGridServicesConnector needs this
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
+	
+[HypergridService]
+	GridService = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+	;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
 
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-- 
cgit v1.1


From a7309d90dacf503b0170ad911289c33e9ab42821 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 08:40:05 -0800
Subject: * Added ServiceURLs to AgentCircuitData. * Fixed a configuration
 buglet introduced yesterday in StandaloneHypergrid.ini.

---
 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 cd09091..79a8775 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -69,7 +69,7 @@
 	Realm = "regions"
 	
 [HypergridService]
-	GridService = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+	GridService = "OpenSim.Services.GridService.dll:GridService"
 	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
 
 [GatekeeperService]
-- 
cgit v1.1


From f276ba57bf5bd732fbc6a255213c9bb7f5f5f148 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 11:33:47 -0800
Subject: HG agent transfers are starting to work. Gatekeeper handlers are
 missing.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 79a8775..3d05d51 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,7 +20,7 @@
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "BasicEntityTransferModule"
+    EntityTransferModule = "HGEntityTransferModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -28,6 +28,8 @@
     NeighbourServiceInConnector = true
     LibraryModule = true
     LLLoginServiceInConnector = true
+    ;; err, temporary
+    SimulationServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -103,3 +105,8 @@
     DefaultRegion = "OpenSim Test"
     WelcomeMessage = "Welcome, Avatar!"
     
+    HomeURI = "http://127.0.0.1:9000"
+    GatewayURI = "http://127.0.0.1:9000"
+    InventoryServerURI = "http://127.0.0.1:9000"
+    AssetServerURI = "http://127.0.0.1:9000"
+
-- 
cgit v1.1


From b2e6ec9e12ad07eb08496ebe8ca0476b793017d5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 18:04:55 -0800
Subject: Agent gets there through the Gatekeeper, but still a few quirks to
 fix.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 3d05d51..67714cf 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -28,8 +28,7 @@
     NeighbourServiceInConnector = true
     LibraryModule = true
     LLLoginServiceInConnector = true
-    ;; err, temporary
-    SimulationServiceInConnector = true
+    AuthenticationServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
-- 
cgit v1.1


From b5fcb5e872ec138ff7138906bffae193b6dae1a6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 20:10:42 -0800
Subject: HG teleports through gatekeeper are working.

---
 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 67714cf..eb887a6 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -29,6 +29,7 @@
     LibraryModule = true
     LLLoginServiceInConnector = true
     AuthenticationServiceInConnector = true
+    SimulationServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
-- 
cgit v1.1


From 3d536944153d4931cf891d6a788a47484f3e6f4d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 16:34:23 -0800
Subject: Go Home works. With security!!

---
 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 eb887a6..28b9d47 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -82,6 +82,9 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
 
+[HGEntityTransferModule]
+	HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService"
+	
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
-- 
cgit v1.1


From 9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 20:35:59 -0800
Subject: * Towards enabling hyperlinks at grid-level. * Updated grid configs

---
 bin/config-include/GridHypergrid.ini | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4b6bc17..4885a41 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,18 +17,17 @@
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
-    EntityTransferModule = "BasicEntityTransferModule"
+    EntityTransferModule = "HGEntityTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
-    HypergridServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = true
     InventoryServiceInConnector = false
     AssetServiceInConnector = false
-    LLLoginServiceInConnector = false
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -41,12 +40,12 @@
 [GridService]
     ; for the HGGridServicesConnector to instantiate
     GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+	HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-[LibraryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-    LibraryName = "OpenSim Library"
-    DefaultLibrary = "./inventory/Libraries.xml"
+[HypergridService]
+	GridService = "OpenSim.Services.GridService.dll:GridService"
+	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-- 
cgit v1.1


From 48b03c2c61a422c3ac9843892a2ae93b29a9f7b8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Jan 2010 14:30:48 -0800
Subject: Integrated the hyperlinking with the GridService.

---
 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 28b9d47..af502db 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -65,7 +65,7 @@
 [GridService]
     ; for the HGGridServicesConnector to instantiate
 	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-	HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
+	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
 	; LocalGridServicesConnector needs this
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
-- 
cgit v1.1


From 8ddf787cfd090fc8f2715a6f2a5329348a12e28b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Jan 2010 16:00:28 -0800
Subject: Hypergrid map search back on, this time with a config var in the grid
 service.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index af502db..0be7bab 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -70,6 +70,8 @@
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
 	
+	AllowHypergridMapSearch = true
+	
 [HypergridService]
 	GridService = "OpenSim.Services.GridService.dll:GridService"
 	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-- 
cgit v1.1


From 7c00469cd210cfdda3dd835867469159d4c8b9d9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 27 Jan 2010 08:00:29 -0800
Subject: Added ExternalName config on Gatekeeper.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 0be7bab..98e37e3 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -83,6 +83,8 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    ; how does the outside world reach me? This acts as public key too.
+    ExternalName = "http://127.0.0.1:9000"
 
 [HGEntityTransferModule]
 	HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService"
-- 
cgit v1.1


From 00f7d622cbc2c2e61d2efaacd8275da3f9821d8b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Jan 2010 19:19:42 -0800
Subject: HG 1.5 is in place. Tested in standalone only.

---
 bin/config-include/StandaloneHypergrid.ini | 38 ++++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 98e37e3..9897149 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -72,23 +72,6 @@
 	
 	AllowHypergridMapSearch = true
 	
-[HypergridService]
-	GridService = "OpenSim.Services.GridService.dll:GridService"
-	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-
-[GatekeeperService]
-    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-	;; for the service
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
-    ; how does the outside world reach me? This acts as public key too.
-    ExternalName = "http://127.0.0.1:9000"
-
-[HGEntityTransferModule]
-	HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService"
-	
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
@@ -100,9 +83,11 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -113,7 +98,24 @@
     WelcomeMessage = "Welcome, Avatar!"
     
     HomeURI = "http://127.0.0.1:9000"
-    GatewayURI = "http://127.0.0.1:9000"
+    GatekeeperURI = "http://127.0.0.1:9000"
     InventoryServerURI = "http://127.0.0.1:9000"
     AssetServerURI = "http://127.0.0.1:9000"
 
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+	;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+	UserAgentService = "OpenSim.Services.Hypergrid.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    ; how does the outside world reach me? This acts as public key too.
+    ExternalName = "http://127.0.0.1:9000"
+
+[UserAgentService]
+	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+	;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+	
-- 
cgit v1.1


From c9e64d578de718aca77e250e8ddd8ecb5026d202 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Jan 2010 19:36:42 -0800
Subject: Fixed broken dll name.

---
 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 9897149..0f8483b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -106,7 +106,7 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
 	;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	UserAgentService = "OpenSim.Services.Hypergrid.dll:UserAgentService"
+	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
-- 
cgit v1.1


From 0c81966c0a8f69474fb542d7b4df1780ef756519 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 29 Jan 2010 09:12:22 -0800
Subject: Works for grid login.

---
 bin/config-include/GridHypergrid.ini | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4885a41..6c7e32e 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -40,12 +40,8 @@
 [GridService]
     ; for the HGGridServicesConnector to instantiate
     GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
-	HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-[HypergridService]
-	GridService = "OpenSim.Services.GridService.dll:GridService"
-	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-- 
cgit v1.1


From 5001f61c08fea2ebfcb2590be69073d04d129d70 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 29 Jan 2010 18:59:41 -0800
Subject: * HGGridConnector is no longer necessary. * Handle logout properly.
 This needed an addition to IClientAPI, because of how the logout packet is
 currently being handled -- the agent is being removed from the scene before
 the different event handlers are executed, which is broken.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 6c7e32e..015ced0 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,7 +13,7 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
@@ -38,10 +38,9 @@
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-    GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
+	AllowHypergridMapSearch = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 0f8483b..395537d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -13,9 +13,9 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "LocalNeighbourServicesConnector"
     AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "LocalGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -63,9 +63,6 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
 	; LocalGridServicesConnector needs this
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
-- 
cgit v1.1


From 42f978a478093da579907e15dc29680a3711b27e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 30 Jan 2010 09:23:07 -0800
Subject: * HGScene is no more. * Moved a few key inventory access methods from
 Scene.Inventory to an IInventoryAccessModule module

---
 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 395537d..686d2a4 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -21,6 +21,7 @@
     SimulationServices = "RemoteSimulationConnectorModule"
     AvatarServices = "LocalAvatarServicesConnector"
     EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
-- 
cgit v1.1


From a2096f58cedc3a225e01b300dedc64e2ea59b778 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 30 Jan 2010 17:41:01 -0800
Subject: Updated gridhypergrid config.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 015ced0..4d40766 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -22,6 +22,7 @@
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
-- 
cgit v1.1


From 40d8e91008b7d76ce6b9398484c591eb51c85bdb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 11:10:57 -0800
Subject: * Added a few files that were missing in the repo. * New
 HGInventoryService which allows restricted access to inventory while outside

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 686d2a4..f36b0c4 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -33,7 +33,6 @@
     SimulationServiceInConnector = true
 
 [AssetService]
-    ; For the AssetServiceInConnector
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
 
     ; For HGAssetBroker
@@ -41,7 +40,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
 
     ; For HGInventoryBroker
@@ -49,7 +47,6 @@
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
 [AvatarService]
-    ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [LibraryService]
@@ -117,3 +114,8 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
 	
+;; The interface that local users get when they are in other grids
+;; This greatly restricts the inventory operations while in other grids
+[HGInventoryService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
-- 
cgit v1.1


From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 13:01:23 -0800
Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as
 well as lots of other obsolete configs.

---
 bin/config-include/Grid.ini                | 1 +
 bin/config-include/GridHypergrid.ini       | 5 -----
 bin/config-include/StandaloneHypergrid.ini | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5aae1bc..56c76c6 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -18,6 +18,7 @@
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4d40766..7391278 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,9 +7,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
-[Startup]
-	hypergrid = true
-
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
@@ -27,8 +24,6 @@
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = true
-    InventoryServiceInConnector = false
-    AssetServiceInConnector = false
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f36b0c4..63ea832 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -6,9 +6,6 @@
 
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-
-[Startup]
-	hypergrid = true
 	
 [Modules]
     AssetServices = "HGAssetBroker"
-- 
cgit v1.1


From 67b0fcf806b0f246fd4386410d445b9ac3e29aea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 13:07:13 -0800
Subject: * Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini *
 Cleaned up standalone configs

---
 bin/config-include/StandaloneCommon.ini.example | 14 +++++++++++++-
 bin/config-include/StandaloneHypergrid.ini      |  9 ---------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 0d54b4d..b4db6dc 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,4 +47,16 @@
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
-    ;LibraryName = "My World's Library"
\ No newline at end of file
+    ;LibraryName = "My World's Library"
+    
+[LoginService]
+    DefaultRegion = "OpenSim Test"
+    WelcomeMessage = "Welcome, Avatar!"
+    
+    HomeURI = "http://127.0.0.1:9000"
+    GatekeeperURI = "http://127.0.0.1:9000"
+    InventoryServerURI = "http://127.0.0.1:9000"
+    AssetServerURI = "http://127.0.0.1:9000"
+
+[GatekeeperService]
+    ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 63ea832..06f1898 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -86,14 +86,6 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     
-    DefaultRegion = "OpenSim Test"
-    WelcomeMessage = "Welcome, Avatar!"
-    
-    HomeURI = "http://127.0.0.1:9000"
-    GatekeeperURI = "http://127.0.0.1:9000"
-    InventoryServerURI = "http://127.0.0.1:9000"
-    AssetServerURI = "http://127.0.0.1:9000"
-
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
 	;; for the service
@@ -103,7 +95,6 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     ; how does the outside world reach me? This acts as public key too.
-    ExternalName = "http://127.0.0.1:9000"
 
 [UserAgentService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-- 
cgit v1.1


From 35a245b67a44eaa62dbf7951646ad9818caa8b02 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 22:35:23 -0800
Subject: Assorted bug fixes related to hyperlinking

---
 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 4d94ccd..a62868e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -20,6 +20,7 @@
     ; change this to your grid-wide grid server
     ;
     GridServerURI = "http://mygridserver.com:8003"
+    ;AllowHypergridMapSearch = true
 
 [AvatarService]
     ;
-- 
cgit v1.1


From df3ab04e0ca202f9457339a048343b87578d7c2b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Feb 2010 16:28:41 -0800
Subject: Removed useless config.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index b4db6dc..8e21a8c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -50,9 +50,8 @@
     ;LibraryName = "My World's Library"
     
 [LoginService]
-    DefaultRegion = "OpenSim Test"
     WelcomeMessage = "Welcome, Avatar!"
-    
+
     HomeURI = "http://127.0.0.1:9000"
     GatekeeperURI = "http://127.0.0.1:9000"
     InventoryServerURI = "http://127.0.0.1:9000"
-- 
cgit v1.1


From b18e95b3a228e0ca74e9c90ae191e09022ab35f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 8 Feb 2010 07:49:14 -0800
Subject: Added missing configs to Standalone.ini

---
 bin/config-include/Standalone.ini | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 452b9e9..171611e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -11,12 +11,14 @@
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
     GridServices = "LocalGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "LocalSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
     EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
@@ -31,15 +33,20 @@
 	LibraryName = "OpenSim Library"
 	DefaultLibrary = "./inventory/Libraries.xml"
 
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
 
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -55,6 +62,6 @@
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    
-    DefaultRegion = "OpenSim Test"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
     WelcomeMessage = "Welcome, Avatar!"
-- 
cgit v1.1


From 9f5b39300a729ffb27cdf908e0d12f9576f38b78 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Feb 2010 20:26:47 +0000
Subject: Add InventoryService to default standalone config

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 171611e..0c74ea4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -54,6 +54,7 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-- 
cgit v1.1


From dc197856727c06b0b06488ab839409831af84865 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Feb 2010 16:57:02 -0800
Subject: Added UserAccount, Avatar and Authentication to Data.Null, so that
 OpenSim can run out-of-the-box. #WaitingForSQLite

---
 bin/config-include/Standalone.ini          | 6 ++++++
 bin/config-include/StandaloneHypergrid.ini | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 0c74ea4..bd90df4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -35,10 +35,15 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
+[AuthenticationService]
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
@@ -50,6 +55,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 06f1898..a4fa5be 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -45,6 +45,7 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 
 [LibraryService]
 	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -56,19 +57,23 @@
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    
+    StorageProvider = "OpenSim.Data.Null.dll"
+
 [GridService]
 	; LocalGridServicesConnector needs this
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 	Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
 	
 	AllowHypergridMapSearch = true
 	
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
     ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-- 
cgit v1.1


From 0ab6aac05255078a9d190f6623b2d86d5253d955 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Feb 2010 17:52:38 -0800
Subject: Added UserAccountData and auth to the SQLite connector. Compiles,
 runs, but access to these tables doesn't work.

---
 bin/config-include/Standalone.ini          | 8 +++++---
 bin/config-include/StandaloneHypergrid.ini | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bd90df4..b9a9462 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -4,9 +4,6 @@
 ;; which you can copy and change.
 ;;
 
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
@@ -72,3 +69,8 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
     WelcomeMessage = "Welcome, Avatar!"
+
+
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a4fa5be..9ad6d1c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,9 +3,6 @@
 ;; All optional settings are in StandaloneCommon.ini.example,
 ;; which you can copy and change.
 ;;
-
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
 	
 [Modules]
     AssetServices = "HGAssetBroker"
@@ -112,3 +109,8 @@
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+
+
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
-- 
cgit v1.1


From 552e9e8c7832f41f5a53666d9c3ece62f57be4ba Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Feb 2010 09:09:35 -0800
Subject: * Added SQlite connector for AvatarData. Tested -- works. * Small bug
 fix in debug message * Set default standalone configs to use SQLite across
 the board

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index b9a9462..06333d8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -32,14 +32,14 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -52,7 +52,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 9ad6d1c..04a2356 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,7 +42,7 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [LibraryService]
 	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -54,7 +54,7 @@
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
 	; LocalGridServicesConnector needs this
@@ -70,7 +70,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-- 
cgit v1.1


From e6c869ddfc73af3cdb01b1232932db81cf6d0621 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 22 Feb 2010 13:18:11 +0900
Subject: Minor formatting cleanup.

---
 bin/config-include/Standalone.ini | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..35ee01e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -20,11 +20,10 @@
 
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-    
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [GridService]
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
-
-- 
cgit v1.1


From 679ad9575083370204a6d83e9933323c9f60ae45 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Feb 2010 16:11:04 -0800
Subject: List of friends now retrieved upon login. Configured and tested in
 standalone only.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 06333d8..ce77b3f 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -59,6 +59,9 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
+
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -67,6 +70,7 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 04a2356..ecdd6f7 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,8 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
@@ -87,16 +89,18 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
     
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-	;; for the service
+    ;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
-    ; how does the outside world reach me? This acts as public key too.
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    WelcomeMessage = "Welcome, Avatar!"
 
 [UserAgentService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-- 
cgit v1.1


From c745df007d1730e59fbdb4ebf8440654d1675ade Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Feb 2010 17:42:51 -0800
Subject: Added server-side Friends in connector. Untested.

---
 bin/config-include/Grid.ini          | 3 +++
 bin/config-include/GridHypergrid.ini | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 56c76c6..a656e7b 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -34,3 +34,6 @@
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
     LibraryName = "OpenSim Library"
     DefaultLibrary = "./inventory/Libraries.xml"
+
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 7391278..36cefdc 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -40,3 +40,6 @@
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
 	AllowHypergridMapSearch = true
+
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector"
-- 
cgit v1.1


From cc05bdf6aba5d74202cb5863a5d0f5950540e7bd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Feb 2010 08:46:30 -0800
Subject: * Friends out connector completed. Grid login retrieves friends
 correctly. * Added friends configs to grid .inis

---
 bin/config-include/Grid.ini               | 2 +-
 bin/config-include/GridCommon.ini.example | 7 +++++++
 bin/config-include/GridHypergrid.ini      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index a656e7b..9dff325 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -36,4 +36,4 @@
     DefaultLibrary = "./inventory/Libraries.xml"
 
 [Friends]
-    Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector"
+    Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a62868e..4717561 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -46,6 +46,13 @@
     ;
     AuthenticationServerURI = "http://mygridserver.com:8003"
 
+[FriendsService]
+    ;
+    ; change this to your grid-wide friends server
+    ;
+    FriendsServerURI = "http://mygridserver.com:8003"
+
+
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 36cefdc..b567817 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -42,4 +42,4 @@
 	AllowHypergridMapSearch = true
 
 [Friends]
-    Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector"
+    Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
-- 
cgit v1.1


From 774958bbbf639090e73204be1d5b6d5c7653441a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Feb 2010 16:09:06 -0800
Subject: Added FriendsData to both Null storage and SQLite. Untested.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ce77b3f..b35f8a5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -59,6 +59,10 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[FriendsService]
+    LocalServiceModule = "OpenSim.Services.FriendsService.dll"
+    ConnectionString = "URI=file:friends.db,version=3"
+
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ecdd6f7..ee84c81 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,10 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[FriendsService]
+    LocalServiceModule = "OpenSim.Services.FriendsService.dll"
+    ConnectionString = "URI=file:friends.db,version=3"
+
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
 
-- 
cgit v1.1


From edb176447ba9cd6d29bd45d9b3714aa0dab9cbf9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Mar 2010 22:14:06 +0000
Subject: Fix bug where approximately half the time, attachments would rez only
 their root prim until right clicked (or otherwise updated). The root cause of
 this problem was that multiple ObjectUpdates were being sent on attachment
 which differed enough to confuse the client. Sometimes these would eliminate
 each other and sometimes not, depending on whether the scheduler looked at
 the queued updates. The solution here is to only schedule the ObjectUpdate
 once the attachment code has done all it needs to do.

---
 bin/config-include/Standalone.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf693a1..dc65ffd 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -31,14 +31,14 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
+    ; ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
+    ; ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -51,7 +51,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
+    ; ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -60,7 +60,7 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
+    ; ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
-- 
cgit v1.1


From e97ba577888ae0da6f227fea6a2b78cca1a5d886 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Mar 2010 22:20:06 +0000
Subject: reset the accidental local configuration changes

---
 bin/config-include/Standalone.ini | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dc65ffd..3011370 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,21 +24,22 @@
 
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+
 [LibraryService]
-	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	LibraryName = "OpenSim Library"
-	DefaultLibrary = "./inventory/Libraries.xml"
+  	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+	  LibraryName = "OpenSim Library"
+	  DefaultLibrary = "./inventory/Libraries.xml"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ; ConnectionString = "URI=file:avatars.db,version=3"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ; ConnectionString = "URI=file:auth.db,version=3"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -51,7 +52,8 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; ConnectionString = "URI=file:userprofiles.db,version=3"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -60,7 +62,7 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ; ConnectionString = "URI=file:friends.db,version=3"
+    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
-- 
cgit v1.1


From 38b8c52762a42c591edbf3e12db044d68c94c950 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 7 Mar 2010 10:01:23 -0800
Subject: Removed obsolete configs.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ee84c81..1d8e2ef 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -18,7 +18,6 @@
     InventoryAccessModule = "HGInventoryAccessModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
-    HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
     LibraryModule = true
@@ -104,7 +103,6 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
-    WelcomeMessage = "Welcome, Avatar!"
 
 [UserAgentService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-- 
cgit v1.1


From 20406498711d1f26037ae32e1b7f8378b01ad848 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 11 Mar 2010 10:05:03 -0800
Subject: Adding the SimianGrid connectors

---
 bin/config-include/SimianGrid.ini | 70 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 bin/config-include/SimianGrid.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
new file mode 100644
index 0000000..af33860
--- /dev/null
+++ b/bin/config-include/SimianGrid.ini
@@ -0,0 +1,70 @@
+[Modules]
+    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianGridUserAccountServiceConnector"
+    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
+    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
+    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
+    
+    LandServiceInConnector = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = false
+    
+    AssetCaching = "FlotsamAssetCache"
+
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
+
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    GridServerURI = "http://localhost/Grid/"
+
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[AssetService]
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+    AssetServerURI = "http://localhost/Grid/?id="
+
+[InventoryService]
+    InventoryServerURI = "http://localhost/Grid/"
+
+[AvatarService]
+    AvatarServerURI = "http://localhost/Grid/"
+
+[PresenceService]
+    PresenceServerURI = "http://localhost/Grid/"
+
+[UserAccountService]
+    UserAccountServerURI = "http://localhost/Grid/"
+
+[AuthenticationService]
+    AuthenticationServerURI = "http://localhost/Grid/"
+
+[FriendsService]
+    FriendsServerURI = "http://localhost/Grid/"
+
+[AssetCache]
+    CacheDirectory = ./assetcache
+    LogLevel = 0
+    HitRateDisplay = 100
+    MemoryCacheEnabled = false
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
+    ; Specify 0 if you do not want your disk cache to expire
+    FileCacheTimeout = 0
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = 0  ;roughly every 10 minutes
-- 
cgit v1.1


From 8b1e33eb2d253daddb760c90526f1a3de95c17d0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 12 Mar 2010 10:31:43 -0800
Subject: Fixed SimianGrid.ini to use GridCommon.ini(.example)

---
 bin/config-include/SimianGrid.ini | 55 +++++++++++++++------------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index af33860..58dcae9 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -1,3 +1,24 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
+;;
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; installed at http://www.mygrid.com/Grid/
+;;
+; AssetServerURI = "http://www.mygrid.com/Grid/?id="
+; InventoryServerURI = "http://www.mygrid.com/Grid/"
+; AvatarServerURI = "http://www.mygrid.com/Grid/"
+; PresenceServerURI = "http://www.mygrid.com/Grid/"
+; UserAccountServerURI = "http://www.mygrid.com/Grid/"
+; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
+; FriendsServerURI = "http://www.mygrid.com/Grid/"
+
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
 [Modules]
     GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
     PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
@@ -25,7 +46,6 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    GridServerURI = "http://localhost/Grid/"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -35,36 +55,3 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-    AssetServerURI = "http://localhost/Grid/?id="
-
-[InventoryService]
-    InventoryServerURI = "http://localhost/Grid/"
-
-[AvatarService]
-    AvatarServerURI = "http://localhost/Grid/"
-
-[PresenceService]
-    PresenceServerURI = "http://localhost/Grid/"
-
-[UserAccountService]
-    UserAccountServerURI = "http://localhost/Grid/"
-
-[AuthenticationService]
-    AuthenticationServerURI = "http://localhost/Grid/"
-
-[FriendsService]
-    FriendsServerURI = "http://localhost/Grid/"
-
-[AssetCache]
-    CacheDirectory = ./assetcache
-    LogLevel = 0
-    HitRateDisplay = 100
-    MemoryCacheEnabled = false
-    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    MemoryCacheTimeout = 2
-    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-    ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
-    ; How often {in hours} should the disk be checked for expired filed
-    ; Specify 0 to disable expiration checking
-    FileCleanupTimer = 0  ;roughly every 10 minutes
-- 
cgit v1.1


From aad17e751383069b799c6a78a3ac4e0ca1020a4d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Mar 2010 20:29:17 +0000
Subject: Simplify database setup and remove migration problems by moving all
 sqlite config-include settings to a separate file for standalone Update
 information in StandaloneCommon.ini.example to reflect this Remove
 ISharedRegionModule interfaces from all SimianGrid connector classes
 temporarily since this stopped standalone from working (due to absence of
 AssetURI settings, etc.). Solution here may be to create separate region
 module connectors as done by local/grid/hypergrid so that loading can be
 controlled via include files Or otherwise work out how to stop these modules
 from being loaded for all OpenSim invocations

---
 bin/config-include/Standalone.ini               |  4 ----
 bin/config-include/StandaloneCommon.ini.example | 23 ++++++++++++++---------
 bin/config-include/storage/SQLiteStandalone.ini | 16 ++++++++++++++++
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 bin/config-include/storage/SQLiteStandalone.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3011370..54e11af 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -32,14 +32,12 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -52,7 +50,6 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
 
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -62,7 +59,6 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8e21a8c..f89c67a 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,19 +1,24 @@
+; This is the main configuration file for standalone OpenSim instances
+
 [DatabaseService]
     ;
-    ;### Choose the DB
+    ; ### Choose the DB
     ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
+
+    ; SQLite
+    ; Uncomment this line if you want to use sqlite storage
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; For MySql.  
+    ; Uncomment these lines if you want to use mysql storage 
+    ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
 
 [AssetService]
-
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
@@ -35,10 +40,10 @@
 
 [GridService]
     ;; For in-memory region storage (default)
-	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+	  StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     ;;--- For MySql region storage (alternative)
- 	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
-	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+ 	  ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
new file mode 100644
index 0000000..1ce0357
--- /dev/null
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"
-- 
cgit v1.1


From 19b4770fe7620b184060b57fe5fa4418c5010c14 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Mar 2010 22:18:48 +0000
Subject: start laoding griduser local connector, though it isn't invoked by
 anything yet

---
 bin/config-include/Standalone.ini | 40 +++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 54e11af..92c2154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
 ;;
 
 [Modules]
-    AssetServices = "LocalAssetServicesConnector"
-    InventoryServices = "LocalInventoryServicesConnector"
-    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
-    SimulationServices = "LocalSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "BasicEntityTransferModule"
-    InventoryAccessModule = "BasicInventoryAccessModule"
+    AssetServices           = "LocalAssetServicesConnector"
+    InventoryServices       = "LocalInventoryServicesConnector"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
+    GridUserServices        = "LocalGridUserServicesConnector"
+    SimulationServices      = "LocalSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
@@ -57,6 +58,9 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[GridUserService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
+
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
 
@@ -64,14 +68,14 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
 
-- 
cgit v1.1


From 28e4302eb6c112576e418f4128dfe6193c4c5e13 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 15 Mar 2010 22:07:28 -0700
Subject: Fixed a bad module name in SimianGrid.ini

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 58dcae9..064f36e 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -22,7 +22,7 @@
 [Modules]
     GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
     PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianGridUserAccountServiceConnector"
+    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
     AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
     AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
     InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
-- 
cgit v1.1


From ee198eaa11bb1b10e0b8439367d2db59f28bb5a4 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sun, 4 Apr 2010 11:58:06 -0700
Subject: Updates to config files for groups

Signed-off-by: Melanie <melanie@t-data.com>
---
 bin/config-include/GridCommon.ini.example |  6 ++++++
 bin/config-include/SimianGrid.ini         | 10 ++++++++++
 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 4717561..6e27694 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -52,6 +52,12 @@
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
+[Groups]
+    ;
+    ; change this to your grid-wide groups server
+    ;
+    GroupsServerURI = "http://mygridserver.com:82/Grid/"
+
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 064f36e..41deb92 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -15,6 +15,7 @@
 ; UserAccountServerURI = "http://www.mygrid.com/Grid/"
 ; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
 ; FriendsServerURI = "http://www.mygrid.com/Grid/"
+; GroupsServerURI = "http://www.mygrid.com/Grid/"
 
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
@@ -55,3 +56,12 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
+	
+[Groups]
+    Enabled = true
+    Module  = GroupsModule
+    DebugEnabled     = false
+    NoticesEnabled   = true
+    MessagingModule = GroupsMessagingModule
+    MessagingEnabled = true
+    ServicesConnectorModule = SimianGroupsServicesConnector
-- 
cgit v1.1


From 15d42d211161b304bc4281018b891a063be4612d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Apr 2010 22:06:02 +0100
Subject: Add instructions for using SQLiteNG to OpenSim.ini and
 config-include/StandaloneCommon.ini Unfortunately, database settings need to
 be changed in two places.

---
 bin/config-include/StandaloneCommon.ini.example   |  8 ++++++--
 bin/config-include/storage/SQLiteNGStandalone.ini | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 bin/config-include/storage/SQLiteNGStandalone.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f89c67a..74bdbe2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,10 +6,14 @@
     ;
 
     ; SQLite
-    ; Uncomment this line if you want to use sqlite storage
+    ; Uncomment this line if you want to use sqlite storage with Mono 2.4
     Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
-    ; For MySql.  
+    ; If you want to use sqlite with Mono 2.6 and above, uncomment this line instead.
+    ; Don't forget to do the same thing for the storage_plugin setting in OpenSim.ini
+    ; Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
+
+    ; MySql  
     ; Uncomment these lines if you want to use mysql storage 
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
diff --git a/bin/config-include/storage/SQLiteNGStandalone.ini b/bin/config-include/storage/SQLiteNGStandalone.ini
new file mode 100644
index 0000000..ba00aca
--- /dev/null
+++ b/bin/config-include/storage/SQLiteNGStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLiteNG.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"
-- 
cgit v1.1


From 60dbc3c6ce5b9b78a29c0968951e96895c270241 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 17:01:50 +0100
Subject: Make SQLiteNG the default since it actually does work with Mono 2.4
 on Linux. I know this is tough on Mac OSX users (since SQLiteNG requires the
 export of the sqlite3_column_origin_name symbol and this isn't present for
 the Mac OSX sqlite3 system library) Unfortunately, I need to shaft somebody
 (as it were)

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 74bdbe2..58860d1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,12 +6,12 @@
     ;
 
     ; SQLite
-    ; Uncomment this line if you want to use sqlite storage with Mono 2.4
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
 
-    ; If you want to use sqlite with Mono 2.6 and above, uncomment this line instead.
-    ; Don't forget to do the same thing for the storage_plugin setting in OpenSim.ini
-    ; Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
+    ; Unfortunately SQLiteNG is not compatible with Mac OSX.  You can still use the older
+    ; sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini for sqlite
+    ; for more details
+    ;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql  
     ; Uncomment these lines if you want to use mysql storage 
-- 
cgit v1.1


From cc67de5b86ebcebadbe2ea46872a0dc63d99cae7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 17:45:00 +0100
Subject: rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the
 least evil way forward since mono 2.6 and later will see increasing usage,
 and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE
 REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in
 OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See
 the OpenSim.ini.example and StandaloneCommon.ini.example files for more
 details This commit also temporarily changes unsigned ParentEstateID values
 in the OpenSim.Data.Tests to signed temporarily, since the new plugin
 enforces creation of signed fields in the database (which is what the SQL
 actually specifies).  And change data columns in sqlite is a pita.

---
 bin/config-include/StandaloneCommon.ini.example       |  8 ++++----
 bin/config-include/storage/SQLiteLegacyStandalone.ini | 16 ++++++++++++++++
 bin/config-include/storage/SQLiteNGStandalone.ini     | 16 ----------------
 3 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 bin/config-include/storage/SQLiteLegacyStandalone.ini
 delete mode 100644 bin/config-include/storage/SQLiteNGStandalone.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 58860d1..572c153 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,12 +6,12 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
-    ; Unfortunately SQLiteNG is not compatible with Mac OSX.  You can still use the older
-    ; sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini for sqlite
+    ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX.  You can still use the older
+    ; legacy sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini (search for sqlite)
     ; for more details
-    ;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
 
     ; MySql  
     ; Uncomment these lines if you want to use mysql storage 
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
new file mode 100644
index 0000000..1d4dd29
--- /dev/null
+++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"
diff --git a/bin/config-include/storage/SQLiteNGStandalone.ini b/bin/config-include/storage/SQLiteNGStandalone.ini
deleted file mode 100644
index ba00aca..0000000
--- a/bin/config-include/storage/SQLiteNGStandalone.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; These are the initialization settings for running OpenSim Standalone with an SQLite database
-
-[DatabaseService]
-    StorageProvider = "OpenSim.Data.SQLiteNG.dll"
-
-[AvatarService]
-    ConnectionString = "URI=file:avatars.db,version=3"
-
-[AuthenticationService]
-    ConnectionString = "URI=file:auth.db,version=3"
-
-[UserAccountService]
-    ConnectionString = "URI=file:userprofiles.db,version=3"
-
-[FriendsService]
-    ConnectionString = "URI=file:friends.db,version=3"
-- 
cgit v1.1


From bd49985afa0a30cf9338730807a42eff3d508bee Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 2 May 2010 10:31:35 -0700
Subject: Switched everything to XInventory by default. The old Inventory is
 still there for now, in case bugs pop up with XInventory.

---
 bin/config-include/Grid.ini                     | 2 +-
 bin/config-include/GridHypergrid.ini            | 3 +--
 bin/config-include/Standalone.ini               | 6 +++---
 bin/config-include/StandaloneHypergrid.ini      | 9 ++++-----
 bin/config-include/storage/SQLiteStandalone.ini | 6 ++++++
 5 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9dff325..4767cbc 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -9,7 +9,7 @@
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
-    InventoryServices = "RemoteInventoryServicesConnector"
+    InventoryServices = "RemoteXInventoryServicesConnector"
     GridServices = "RemoteGridServicesConnector"
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index b567817..051a87e 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,8 +30,7 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
-    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
 
 [GridService]
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 92c2154..027b4ea 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,7 +24,7 @@
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
 [InventoryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [LibraryService]
   	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -56,7 +56,7 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -71,7 +71,7 @@
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService           = "OpenSim.Services.GridService.dll:GridService"
     AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1d8e2ef..35e6f20 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -33,11 +33,10 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
     ; For HGInventoryBroker
-    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -74,7 +73,7 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
@@ -88,7 +87,7 @@
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index 1ce0357..ed88a8a 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -3,6 +3,11 @@
 [DatabaseService]
     StorageProvider = "OpenSim.Data.SQLite.dll"
 
+[InventoryService]
+    ;ConnectionString = "URI=file:inventory.db,version=3"
+    ; if you have a legacy inventory store use the connection string below
+    ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
+
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
 
@@ -14,3 +19,4 @@
 
 [FriendsService]
     ConnectionString = "URI=file:friends.db,version=3"
+
-- 
cgit v1.1


From 53594e599e7f10bed441007f29a08d23e41e9188 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 5 May 2010 21:12:13 -0700
Subject: * Fixes Library bugs in grid mode. Partly a missing check and partly
 a missing configuration. * Made previous Robust config changes consistent in
 Robust.HG.ini.example

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 051a87e..1e24f88 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -40,5 +40,10 @@
 
 	AllowHypergridMapSearch = true
 
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
-- 
cgit v1.1


From a58859a0d4206c194c9c56212218e2cafc2cc373 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 May 2010 21:29:56 -0700
Subject: GridUserService in place. Replaces the contrived concept of storing
 user's home and position info in the presence service. WARNING: I violated a
 taboo by deleting 2 migration files and simplifying the original table
 creation for Presence. This should not cause any problems to anyone, though.
 Things will work with the new simplified table, as well as with the previous
 contrived one. If there are any problems, solving them is as easy as dropping
 the presence table and deleting its row in the migrations table. The presence
 info only exists during a user's session anyway.

BTW, the Meshing files want to be committed too -- EOFs.
---
 bin/config-include/Grid.ini                     | 33 +++++++------
 bin/config-include/GridCommon.ini.example       |  6 +++
 bin/config-include/GridHypergrid.ini            | 34 +++++++------
 bin/config-include/Standalone.ini               |  8 +--
 bin/config-include/StandaloneHypergrid.ini      | 65 +++++++++++++------------
 bin/config-include/storage/SQLiteStandalone.ini |  3 ++
 6 files changed, 84 insertions(+), 65 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4767cbc..9a75f19 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,21 +8,24 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices = "RemoteAssetServicesConnector"
-    InventoryServices = "RemoteXInventoryServicesConnector"
-    GridServices = "RemoteGridServicesConnector"
-    AvatarServices = "RemoteAvatarServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
-    AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    PresenceServices = "RemotePresenceServicesConnector"
-    UserAccountServices = "RemoteUserAccountServicesConnector"
-    SimulationServices = "RemoteSimulationConnectorModule"
-    EntityTransferModule = "BasicEntityTransferModule"
-    InventoryAccessModule = "BasicInventoryAccessModule"
-    LandServiceInConnector = true
-    NeighbourServiceInConnector = true
-    SimulationServiceInConnector = true
-    LibraryModule = true
+    AssetServices			= "RemoteAssetServicesConnector"
+    InventoryServices		= "RemoteXInventoryServicesConnector"
+    GridServices			= "RemoteGridServicesConnector"
+    AvatarServices			= "RemoteAvatarServicesConnector"
+    NeighbourServices		= "RemoteNeighbourServicesConnector"
+    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
+    AuthorizationServices	= "RemoteAuthorizationServicesConnector"
+    PresenceServices		= "RemotePresenceServicesConnector"
+    UserAccountServices		= "RemoteUserAccountServicesConnector"
+    GridUserServices		= "RemoteGridUserServicesConnector"
+    SimulationServices		= "RemoteSimulationConnectorModule"
+    EntityTransferModule	= "BasicEntityTransferModule"
+    InventoryAccessModule	= "BasicInventoryAccessModule"
+    
+    LandServiceInConnector			= true
+    NeighbourServiceInConnector		= true
+    SimulationServiceInConnector	= true
+    LibraryModule					= true
 
 
 [GridService]
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6e27694..88ac5e2 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,6 +40,12 @@
     ;
     UserAccountServerURI = "http://mygridserver.com:8003"
 
+[GridUserService]
+    ;
+    ; change this to your grid-wide user accounts server
+    ;
+    GridUserServerURI = "http://mygridserver.com:8003"
+
 [AuthenticationService]
     ;
     ; change this to your grid-wide authentication server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1e24f88..1adc2d8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,22 +8,24 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices = "HGAssetBroker"
-    InventoryServices = "HGInventoryBroker"
-    GridServices = "RemoteGridServicesConnector"
-    AvatarServices = "RemoteAvatarServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
-    AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
-    PresenceServices = "RemotePresenceServicesConnector"
-    UserAccountServices = "RemoteUserAccountServicesConnector"
-    SimulationServices = "RemoteSimulationConnectorModule"
-    EntityTransferModule = "HGEntityTransferModule"
-    InventoryAccessModule = "HGInventoryAccessModule"
-    LandServiceInConnector = true
-    NeighbourServiceInConnector = true
-    SimulationServiceInConnector = true
-    LibraryModule = true
+    AssetServices			= "HGAssetBroker"
+    InventoryServices		= "HGInventoryBroker"
+    GridServices			= "RemoteGridServicesConnector"
+    AvatarServices			= "RemoteAvatarServicesConnector"
+    NeighbourServices		= "RemoteNeighbourServicesConnector"
+    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
+    AuthorizationServices	= "RemoteAuthorizationServicesConnector"
+    PresenceServices		= "RemotePresenceServicesConnector"
+    UserAccountServices		= "RemoteUserAccountServicesConnector"
+    GridUserServices		= "RemoteGridUserServicesConnector"
+    SimulationServices		= "RemoteSimulationConnectorModule"
+    EntityTransferModule	= "HGEntityTransferModule"
+    InventoryAccessModule	= "HGInventoryAccessModule"
+    
+    LandServiceInConnector			= true
+    NeighbourServiceInConnector		= true
+    SimulationServiceInConnector	= true
+    LibraryModule					= true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 027b4ea..6b7dc50 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,8 +17,9 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    LibraryModule = true
-    LLLoginServiceInConnector = true
+    
+    LibraryModule				= true
+    LLLoginServiceInConnector	= true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -54,7 +55,7 @@
 
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -70,6 +71,7 @@
 [LoginService]
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService		  = "OpenSim.Services.UserAccountService.dll:GridUserService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 35e6f20..130e210 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,25 +5,27 @@
 ;;
 	
 [Modules]
-    AssetServices = "HGAssetBroker"
-    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
-    SimulationServices = "RemoteSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "HGEntityTransferModule"
-    InventoryAccessModule = "HGInventoryAccessModule"
-    InventoryServiceInConnector = true
-    AssetServiceInConnector = true
-    HypergridServiceInConnector = true
-    NeighbourServiceInConnector = true
-    LibraryModule = true
-    LLLoginServiceInConnector = true
-    AuthenticationServiceInConnector = true
-    SimulationServiceInConnector = true
+    AssetServices			= "HGAssetBroker"
+    InventoryServices		= "HGInventoryBroker"
+    NeighbourServices		= "LocalNeighbourServicesConnector"
+    AuthenticationServices	= "LocalAuthenticationServicesConnector"
+    GridServices			= "LocalGridServicesConnector"
+    PresenceServices		= "LocalPresenceServicesConnector"
+    UserAccountServices		= "LocalUserAccountServicesConnector"
+    GridUserServices        = "LocalGridUserServicesConnector"
+    SimulationServices		= "RemoteSimulationConnectorModule"
+    AvatarServices			= "LocalAvatarServicesConnector"
+    EntityTransferModule	= "HGEntityTransferModule"
+    InventoryAccessModule	= "HGInventoryAccessModule"
+    
+    InventoryServiceInConnector			= true
+    AssetServiceInConnector				= true
+    HypergridServiceInConnector			= true
+    NeighbourServiceInConnector			= true
+    LibraryModule						= true
+    LLLoginServiceInConnector			= true
+    AuthenticationServiceInConnector	= true
+    SimulationServiceInConnector		= true
 
 [AssetService]
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
@@ -68,10 +70,10 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
+
     ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -83,15 +85,16 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
+	UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService				= "OpenSim.Services.GridService.dll:GridService"
+    AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
     
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -106,7 +109,7 @@
 [UserAgentService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
 	;; for the service
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
 	
 ;; The interface that local users get when they are in other grids
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index ed88a8a..fe814d7 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -17,6 +17,9 @@
 [UserAccountService]
     ConnectionString = "URI=file:userprofiles.db,version=3"
 
+[GridUserService]
+    ConnectionString = "URI=file:griduser.db,version=3"
+
 [FriendsService]
     ConnectionString = "URI=file:friends.db,version=3"
 
-- 
cgit v1.1


From c1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 8 May 2010 12:21:17 -0700
Subject: * Added missing loggout notification to home grid upon agents logging
 out in foreign grids. * Added missing config in StandaloneHypergrid.ini

---
 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 130e210..32b240b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,9 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
+[GridUserService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
+
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
     ConnectionString = "URI=file:friends.db,version=3"
-- 
cgit v1.1


From 49f4becdae9faf4afbf03c4e464237e323de496d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 16 May 2010 08:10:57 -0700
Subject: * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite
 connection strings. * Added a comment in LLLoginService.cs, for future
 reference

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 32b240b..52e30e2 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,7 +42,6 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
 
 [LibraryService]
 	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -54,7 +53,6 @@
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
 	; LocalGridServicesConnector needs this
@@ -82,7 +80,6 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
-- 
cgit v1.1


From eff641ab83c124bded9434dfb776838926028b65 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 12 Jun 2010 17:08:05 -0700
Subject: Added Old Guids=true to all MySql connection strings.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 572c153..bfa6725 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -17,7 +17,7 @@
     ; Uncomment these lines if you want to use mysql storage 
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-- 
cgit v1.1


From de84da9e7b794433dc8ada0767f51c28f5d9efc0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 18 Jun 2010 23:20:32 +0100
Subject: eliminate SimianGrid [Groups] section from GridCommon.ini.example as
 per Nebadon

this is only used by SimianGrid and is now in SimianGrid.ini
---
 bin/config-include/GridCommon.ini.example | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 88ac5e2..a19591b 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -8,7 +8,6 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
-
 [InventoryService]
     ;
     ; change this to your grid-wide inventory server
@@ -58,13 +57,6 @@
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
-[Groups]
-    ;
-    ; change this to your grid-wide groups server
-    ;
-    GroupsServerURI = "http://mygridserver.com:82/Grid/"
-
-
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
-- 
cgit v1.1


From 20fc35399b8193e3620b0dadca861e90c4afe216 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Jun 2010 14:10:22 -0700
Subject: Fixes mantis #4815 and #4812

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa6725..de8677f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
 
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
+
+	; Does this grid allow incoming links to any region in it? 
+	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+	AllowTeleportsToAnyRegion = true
+
-- 
cgit v1.1


From cd19e6fe325198b1fbcdc41bb7169e0525729525 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Jul 2010 07:38:15 -0700
Subject: Fixes mantis #4842

---
 bin/config-include/GridHypergrid.ini       | 3 +++
 bin/config-include/StandaloneHypergrid.ini | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1adc2d8..ab29018 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,6 +7,9 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
+[Startup]
+	WorldMapModule = "HGWorldMap"
+
 [Modules]
     AssetServices			= "HGAssetBroker"
     InventoryServices		= "HGInventoryBroker"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 52e30e2..e87270d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,7 +3,10 @@
 ;; All optional settings are in StandaloneCommon.ini.example,
 ;; which you can copy and change.
 ;;
-	
+
+[Startup]
+	WorldMapModule = "HGWorldMap"
+
 [Modules]
     AssetServices			= "HGAssetBroker"
     InventoryServices		= "HGInventoryBroker"
-- 
cgit v1.1


From 7b471bb21c534453f32c52d0a30d69bd4d49d83c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Jul 2010 03:04:34 +0100
Subject: Adding sample configuration to previous patch

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 41deb92..65d4ea6 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -65,3 +65,6 @@
     MessagingModule = GroupsMessagingModule
     MessagingEnabled = true
     ServicesConnectorModule = SimianGroupsServicesConnector
+
+[Profiles]
+    Module  = SimianProfiles
-- 
cgit v1.1


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/config-include/StandaloneHypergrid.ini | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/config-include')

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 009053479302e7581a85c7574a6cc8eaa23745d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 6 Aug 2010 17:43:09 -0700
Subject: Added Check4096 config var under [GridService], at the request of
 many. Changed the iteration that Marck had on the Hyperlinker. ATTENTION!
 CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and
 StandaloneCommon.ini.example.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index de8677f..9d1c884 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -48,6 +48,9 @@
     ;;--- For MySql region storage (alternative)
  	  ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
+	; If HG, do you want this check on the distance to be performed?
+    ; Check4096 = "False"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
-- 
cgit v1.1


From 1314c87f36edd78f5070cc50f5b705b721c9196d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 8 Aug 2010 09:50:03 -0700
Subject: Enabled GridInfoServiceInConnector for standalones.

---
 bin/config-include/Standalone.ini               |  1 +
 bin/config-include/StandaloneCommon.ini.example | 44 +++++++++++++++++++++++++
 bin/config-include/StandaloneHypergrid.ini      |  1 +
 3 files changed, 46 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6b7dc50..eae9801 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -20,6 +20,7 @@
     
     LibraryModule				= true
     LLLoginServiceInConnector	= true
+    GridInfoServiceInConnector	= true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 9d1c884..f862960 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -76,3 +76,47 @@
 	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
 	AllowTeleportsToAnyRegion = true
 
+[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
+    ; autoconfigure the client and to provide a nice user experience. If you
+    ; want to facilitate that, you should configure the settings here according
+    ; to your grid or standalone setup.
+    ;
+    ; See http://opensimulator.org/wiki/GridInfo
+
+    ; login uri: for grid this is the login server URI
+    login = http://127.0.0.1:9000/
+
+    ; long grid name: the long name of your grid
+    gridname = "the lost continent of hippo"
+
+    ; short grid name: the short name of your grid
+    gridnick = "hippogrid"
+
+    ; login page: optional: if it exists it will be used to tell the client to use
+    ;                       this as splash page
+    ; currently unused
+    ;welcome = http://127.0.0.1/welcome
+
+    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ;                       this for all economy related things
+    ; currently unused
+    ;economy = http://127.0.0.1:9000/
+
+    ; web page of grid: optional: page providing further information about your grid
+    ; currently unused
+    ;about = http://127.0.0.1/about/
+
+    ; account creation: optional: page providing further information about obtaining
+    ;                             a user account on your grid
+    ; currently unused
+    ;register = http://127.0.0.1/register
+
+    ; help: optional: page providing further assistance for users of your grid
+    ; currently unused
+    ;help = http://127.0.0.1/help
+
+    ; password help: optional: page providing password assistance for users of your grid
+    ; currently unused
+    ;password = http://127.0.0.1/password
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 35e7da2..317af4b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -27,6 +27,7 @@
     NeighbourServiceInConnector			= true
     LibraryModule						= true
     LLLoginServiceInConnector			= true
+	GridInfoServiceInConnector			= true
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
 
-- 
cgit v1.1


From 4f79143f3f058b0570c073b668f4ea088e541a43 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 3 Sep 2010 13:36:35 -0700
Subject: * Removed Simian.IsSimianEnabled() call, changed the SimianGrid
 connectors to handle initialization as graceful as possible with the current
 broken way region module initialization is done * Added
 config-include/HyperSimianGrid.ini option for connecting to SimianGrid with
 HyperGrid enabled (work in progress on the SimianGrid side)

---
 bin/config-include/HyperSimianGrid.ini | 77 ++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 bin/config-include/HyperSimianGrid.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
new file mode 100644
index 0000000..87ffe69
--- /dev/null
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -0,0 +1,77 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
+;;
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; installed at http://www.mygrid.com/Grid/
+;;
+; AssetServerURI = "http://www.mygrid.com/Grid/?id="
+; InventoryServerURI = "http://www.mygrid.com/Grid/"
+; AvatarServerURI = "http://www.mygrid.com/Grid/"
+; PresenceServerURI = "http://www.mygrid.com/Grid/"
+; UserAccountServerURI = "http://www.mygrid.com/Grid/"
+; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
+; FriendsServerURI = "http://www.mygrid.com/Grid/"
+; GroupsServerURI = "http://www.mygrid.com/Grid/"
+
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
+    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AssetServices = "HGAssetBroker"
+    InventoryServices = "HGInventoryBroker"
+    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
+    
+    LandServiceInConnector = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = false
+    
+    AssetCaching = "FlotsamAssetCache"
+
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
+
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
+    AllowHypergridMapSearch = true
+
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[AssetService]
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
+    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+[InventoryService]
+    LocalGridInventoryService = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
+
+[Groups]
+    Enabled = true
+    Module  = GroupsModule
+    DebugEnabled     = false
+    NoticesEnabled   = true
+    MessagingModule = GroupsMessagingModule
+    MessagingEnabled = true
+    ServicesConnectorModule = SimianGroupsServicesConnector
+
+[Profiles]
+    Module  = SimianProfiles
-- 
cgit v1.1


From 910aa48df3efcb5c1baa6429b65dcfd05796e2ec Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 7 Sep 2010 11:13:37 -0700
Subject: Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify
 services in the way the ROBUST loader expects them (hopefully!)

---
 bin/config-include/HyperSimianGrid.ini | 12 ++++++------
 bin/config-include/SimianGrid.ini      | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..49ba2ca 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..9b27cc7 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
-    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
-    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
+    AssetServices = "SimianAssetServiceConnector"
+    InventoryServices = "SimianInventoryServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
-- 
cgit v1.1


From 0db1ed0b5a6f5bd104c6008f142d173c84263ce5 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 12 Sep 2010 14:20:26 -0700
Subject: * Added ISimulationDataService and IEstateDataService * Removed
 StorageManager * CONFIG CHANGE: There are no more database settings in
 OpenSim.ini. Check the config-include configuration files for region store
 and estate store database settings

---
 bin/config-include/Grid.ini                     |  5 +++++
 bin/config-include/GridCommon.ini.example       | 21 +++++++++++++++++++++
 bin/config-include/GridHypergrid.ini            |  6 ++++++
 bin/config-include/HyperSimianGrid.ini          |  6 ++++++
 bin/config-include/SimianGrid.ini               |  6 ++++++
 bin/config-include/Standalone.ini               |  6 ++++++
 bin/config-include/StandaloneCommon.ini.example |  2 ++
 7 files changed, 52 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9a75f19..4a6a082 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,6 +27,11 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a19591b..c2cd5c3 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,3 +1,24 @@
+[DatabaseService]
+    ;
+    ; ### Choose the DB
+    ;
+
+    ; SQLite
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX.  You can still use the older
+    ; legacy sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini (search for sqlite)
+    ; for more details
+    ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
+
+    ; MySql  
+    ; Uncomment these lines if you want to use mysql storage 
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ; 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=***;"
+
 [AssetService]
 
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index ab29018..d69a945 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,6 +30,12 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 49ba2ca..29b51de 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -41,6 +41,12 @@
     
     AssetCaching = "FlotsamAssetCache"
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
 
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 9b27cc7..239ce30 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -41,6 +41,12 @@
     
     AssetCaching = "FlotsamAssetCache"
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
 
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index eae9801..d74b50e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,12 @@
     LLLoginServiceInConnector	= true
     GridInfoServiceInConnector	= true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f862960..96ef602 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -18,6 +18,8 @@
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; 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;"
 
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-- 
cgit v1.1


From 2ed276eb4759e61337058a0fc138f243b355ab13 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 13 Sep 2010 11:39:58 -0700
Subject: Adding missing ConnectionString lines to [DatabaseService] sections
 for SQLite configs

---
 bin/config-include/storage/SQLiteLegacyStandalone.ini | 1 +
 bin/config-include/storage/SQLiteStandalone.ini       | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
index 1d4dd29..facbbd6 100644
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini
@@ -2,6 +2,7 @@
 
 [DatabaseService]
     StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
+    ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index fe814d7..10e6991 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -2,6 +2,7 @@
 
 [DatabaseService]
     StorageProvider = "OpenSim.Data.SQLite.dll"
+    ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
-- 
cgit v1.1


From c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 Sep 2010 01:38:53 +0100
Subject: Move OpenSimDefaults,ini into config-include in order to put it with
 all the other default files

---
 bin/config-include/OpenSimDefaults.ini | 1299 ++++++++++++++++++++++++++++++++
 1 file changed, 1299 insertions(+)
 create mode 100644 bin/config-include/OpenSimDefaults.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/OpenSimDefaults.ini b/bin/config-include/OpenSimDefaults.ini
new file mode 100644
index 0000000..8d714ce
--- /dev/null
+++ b/bin/config-include/OpenSimDefaults.ini
@@ -0,0 +1,1299 @@
+[Startup]
+    ; Set this to true if you want to log crashes to disk
+    ; this can be useful when submitting bug reports.
+    save_crashes = false
+
+    ; Directory to save crashes to if above is enabled
+    ; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
+    crash_dir = "crashes"
+
+    ; Place to create a PID file
+    ; PIDFile = "/tmp/my.pid"
+
+    ; Http proxy support for llHTTPRequest and dynamic texture loading
+    ; Set HttpProxy to the URL for your proxy server if you would like
+    ; to proxy llHTTPRequests through a firewall
+    ; HttpProxy = "http://proxy.com"
+    ; Set HttpProxyExceptions to a list of regular expressions for
+    ; URLs that you don't want going through the proxy such as servers
+    ; inside your firewall, separate patterns with a ';'
+    ; HttpProxyExceptions = ".mydomain.com;localhost"
+
+    startup_console_commands_file = "startup_commands.txt"
+    shutdown_console_commands_file = "shutdown_commands.txt"
+
+    ; To run a script every few minutes, set the script filename here
+    ; timer_Script = "filename"
+
+    ; ##
+    ; ## SYSTEM
+    ; ##
+
+    ; Sets the method that OpenSim will use to fire asynchronous
+    ; events. Valid values are UnsafeQueueUserWorkItem,
+    ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
+    ; SmartThreadPool is reported to work well on Mono/Linux, but
+    ; UnsafeQueueUserWorkItem has been benchmarked with better
+    ; performance on .NET/Windows
+    async_call_method = SmartThreadPool
+
+    ; Max threads to allocate on the FireAndForget thread pool
+    ; when running with the SmartThreadPool option above
+    MaxPoolThreads = 15
+
+    ; ##
+    ; ## CLIENTS
+    ; ##
+
+    ; Enables EventQueueGet Service.
+    EventQueue = true
+
+    ; Set this to the DLL containing the client stack to use.
+    clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
+
+    ; ##
+    ; ## REGIONS
+    ; ##
+
+    ; Determine where OpenSimulator looks for the files which tell it which regions to server
+    ; Defaults to "filesystem" if this setting isn't present
+    region_info_source = "filesystem"
+    ; region_info_source = "web"
+
+    ; Determines where the region XML files are stored if you are loading these from the filesystem.
+    ; Defaults to bin/Regions in your OpenSimulator installation directory
+    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
+
+    ; Determines the page from which regions xml is retrieved if you are loading these from the web
+    ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
+    ; except that everything is also enclosed in a <Regions> tag.
+    ; regionload_webserver_url = "http://example.com/regions.xml";
+
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = false
+
+    ; Maximum total size, and maximum size where a prim can be physical
+    NonPhysicalPrimMax = 256
+    PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
+    ClampPrimSize = false
+
+    ; Allow scripts to cross region boundaries.  These are recompiled on the new region.
+    AllowScriptCrossing = false
+
+    ; Allow compiled script binary code to cross region boundaries.
+    ; If you set this to "true", any region that can teleport to you can
+    ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
+    ; YOU HAVE BEEN WARNED!!!
+    TrustBinaries = false
+
+    ; Combine all contiguous regions into one large megaregion
+    ; Order your regions from South to North, West to East in your regions.ini and then set this to true
+    ; Warning!  Don't use this with regions that have existing content!, This will likely break them
+    CombineContiguousRegions = false
+
+    ; If you have only one region in an instance, or to avoid the many bugs
+    ; that you can trigger in modules by restarting a region, set this to
+    ; true to make the entire instance exit instead of restarting the region.
+    ; This is meant to be used on systems where some external system like
+    ; Monit will restart any instance that exits, thereby making the shutdown
+    ; into a restart.
+    ;InworldRestartShutsDown = false
+
+    ; ##
+    ; ## PRIM STORAGE
+    ; ##
+
+    ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
+    ; prevent frequently changing objects from heavily loading the region data store.
+    ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
+    ;
+    ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
+    MinimumTimeBeforePersistenceConsidered = 60
+    ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
+    MaximumTimeBeforePersistenceConsidered = 600
+
+    ; Should avatars in neighbor sims see objects in this sim?
+    see_into_this_sim_from_neighbor = true
+
+    ; ##
+    ; ## PHYSICS
+    ; ##
+
+    ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
+    physical_prim = true
+
+    ; Select a mesher here.
+    ;
+    ; Meshmerizer properly handles complex prims by using triangle meshes.
+    ; Note that only the ODE physics engine currently deals with meshed prims in a satisfactory way
+    ;
+    ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
+    ; Usually this is only a box
+
+    meshing = Meshmerizer
+    ;meshing = ZeroMesher
+
+    ; Choose one of the physics engines below
+    ; OpenDynamicsEngine is by some distance the most developed physics engine
+    ; basicphysics effectively does not model physics at all, making all objects phantom
+
+    physics = OpenDynamicsEngine
+    ;physics = basicphysics
+    ;physics = POS
+    ;physics = modified_BulletX
+
+    ; ##
+    ; ## PERMISSIONS
+    ; ##
+
+    ;permissionmodules = "DefaultPermissionsModule"
+
+    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
+    ; any item, etc.  This may not yet be implemented uniformally.
+    ; If set to true, then all permissions checks are carried out
+    ; Default is false
+    serverside_object_permissions = false
+
+    allow_grid_gods = false
+
+    ; This allows somne control over permissions
+    ; please note that this still doesn't duplicate SL, and is not intended to
+    ;region_owner_is_god = true
+    ;region_manager_is_god = false
+    ;parcel_owner_is_god = true
+
+    ; Control user types that are allowed to create new scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can create scripts (subject to normal permissions)
+    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_creators = all
+
+    ; Control user types that are allowed to edit (save) scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can edit scripts (subject to normal permissions)
+    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_editors = all
+
+    ; ##
+    ; ## SCRIPT ENGINE
+    ; ##
+
+    DefaultScriptEngine = "XEngine"
+
+    ; ##
+    ; ## WORLD MAP
+    ; ##
+
+    ;WorldMapModule = "WorldMap"
+    ;MapImageModule = "MapImageModule"
+    ; Set to false to not generate any maptiles
+    ;GenerateMaptiles = "true"
+    ; Refresh (in seconds) the map tile periodically
+    ;MaptileRefresh = 0
+    ; If not generating maptiles, use this static texture asset ID
+    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
+
+    ; ##
+    ; ## EMAIL MODULE
+    ; ##
+
+    ;emailmodule = DefaultEmailModule
+
+    ; ##
+    ; ## ANIMATIONS
+    ; ##
+
+    ; If enabled, enableFlySlow will change the primary fly state to
+    ; FLYSLOW, and the "always run" state will be the regular fly.
+
+    enableflyslow = false
+
+    ; PreJump is an additional animation state, but it probably
+    ; won't look right until the physics engine supports it
+    ; (i.e delays takeoff for a moment)
+
+    ; This is commented so it will come on automatically once it's
+    ; supported.
+
+    ; enableprejump = true
+
+    ; Simulator Stats URI
+    ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Stats_URI = "jsonSimStats"
+
+    ; Make OpenSim start all regions woth logins disabled. They will need
+    ; to be enabled from the console if this is set
+    ; StartDisabled = false
+
+    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
+    ; OpenJPEG if false
+    ; UseCSJ2K = true
+
+[SMTP]
+    enabled=false
+
+    ;enabled=true
+    ;internal_object_host=lsl.opensim.local
+    ;host_domain_header_from=127.0.0.1
+    ;SMTP_SERVER_HOSTNAME=127.0.0.1
+    ;SMTP_SERVER_PORT=25
+    ;SMTP_SERVER_LOGIN=foo
+    ;SMTP_SERVER_PASSWORD=bar
+
+[Network]
+    ConsoleUser = "Test"
+    ConsolePass = "secret"
+    http_listener_port = 9000
+    console_port = 0
+
+    ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
+    ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
+    ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
+    http_listener_ssl = false ; Also create a SSL server
+    http_listener_cn = "localhost" ; Use the cert with the common name
+    http_listener_sslport = 9001 ; Use this port for SSL connections
+    http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
+
+    ; Hostname to use in llRequestURL/llRequestSecureURL
+    ; if not defined - default machine name is being used
+    ; (on Windows this mean NETBIOS name - useably only inside local network)
+    ; ExternalHostNameForLSL=127.0.0.1
+
+    ; What is reported as the "X-Secondlife-Shard"
+    ; Defaults to the user server url if not set
+    ; The old default is "OpenSim", set here for compatibility
+    shard = "OpenSim"
+
+    ; What is reported as the "User-Agent" when using llHTTPRequest
+    ; Defaults to not sent if not set here. See the notes section in the wiki at
+    ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
+    ; " (Mozilla Compatible)" to the text where there are problems with a web server
+    ;user_agent = "OpenSim LSL (Mozilla Compatible)"
+
+[XMLRPC]
+    ; ##
+    ; ## Scripting XMLRPC mapper
+    ; ##
+
+    ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
+    ; script concurrently with the first remote_data event.
+    ; This will contain the fully qualified URI an external site needs
+    ; to use to send XMLRPC requests to that script
+
+    ;XmlRpcRouterModule = "XmlRpcRouterModule"
+    ;XmlRpcPort = 20800
+
+[ClientStack.LindenUDP]
+    ; Set this to true to process incoming packets asynchronously. Networking is
+    ; already separated from packet handling with a queue, so this will only
+    ; affect whether networking internals such as packet decoding and
+    ; acknowledgement accounting are done synchronously or asynchronously
+    ;
+    ;async_packet_handling = false
+
+    ; The client socket receive buffer size determines how many
+    ; incoming requests we can process; the default on .NET is 8192
+    ; which is about 2 4k-sized UDP datagrams. On mono this is
+    ; whatever the underlying operating system has as default; for
+    ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
+    ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
+    ; do "sysctl net.core.rmem_default" to find out what your system
+    ; uses a default socket receive buffer size.
+    ;
+    ; client_socket_rcvbuf_size allows you to specify the receive
+    ; buffer size LLUDPServer should use. NOTE: this will be limited
+    ; by the system's settings for the maximum client receive buffer
+    ; size (on linux systems you can set that with "sysctl -w
+    ; net.core.rmem_max=X")
+    ;
+    ;client_socket_rcvbuf_size = 8388608
+
+    ; Maximum outbound bytes per second for a single scene. This can be used to
+    ; throttle total outbound UDP traffic for a simulator. The default value is
+    ; 0, meaning no throttling at the scene level. The example given here is
+    ; 20 megabits
+    ;
+    ;scene_throttle_max_bps = 2621440
+
+    ; Maximum bits per second to send to any single client. This will override
+    ; the user's viewer preference settings. The default value is 0, meaning no
+    ; aggregate throttling on clients (only per-category throttling). The
+    ; example given here is 1.5 megabits
+    ;
+    ;client_throttle_max_bps = 196608
+
+    ; Per-client bytes per second rates for the various throttle categories.
+    ; These are default values that will be overriden by clients
+    ;
+    ;resend_default = 12500
+    ;land_default = 1000
+    ;wind_default = 1000
+    ;cloud_default = 1000
+    ;task_default = 1000
+    ;texture_default = 1000
+    ;asset_default = 1000
+    ;state_default = 1000
+
+    ; Per-client maximum burst rates in bytes per second for the various
+    ; throttle categories. These are default values that will be overriden by
+    ; clients
+    ;
+    ;resend_limit = 18750
+    ;land_limit = 29750
+    ;wind_limit = 18750
+    ;cloud_limit = 18750
+    ;task_limit = 18750
+    ;texture_limit = 55750
+    ;asset_limit = 27500
+    ;state_limit = 37000
+
+    ; Configures how ObjectUpdates are aggregated. These numbers
+    ; do not literally mean how many updates will be put in each
+    ; packet that goes over the wire, as packets are
+    ; automatically split on a 1400 byte boundary. These control
+    ; the balance between responsiveness of interest list updates
+    ; and total throughput. Higher numbers will ensure more full-
+    ; sized packets and faster sending of data, but more delay in
+    ; updating interest lists
+    ;
+    ;PrimTerseUpdatesPerPacket = 25
+    ;AvatarTerseUpdatesPerPacket = 10
+    ;PrimFullUpdatesPerPacket = 100
+
+    ; TextureSendLimit determines how many packets will be put on
+    ; the outgoing queue each cycle. Like the settings above, this
+    ; is a balance between responsiveness to priority updates and
+    ; total throughput. Higher numbers will give a better
+    ; throughput at the cost of reduced responsiveness to client
+    ; priority changes or transfer aborts
+    ;
+    ;TextureSendLimit = 20
+
+    ; Quash and remove any light properties from attachments not on the
+    ; hands. This allows flashlights and lanterns to function, but kills
+    ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
+    ; will also be affected.
+    ;
+    ;DisableFacelights = "false"
+
+[Chat]
+    ; Controls whether the chat module is enabled.  Default is true.
+    enabled = true;
+
+    ; Distance in meters that whispers should travel.  Default is 10m
+    whisper_distance = 10
+
+    ; Distance in meters that ordinary chat should travel.  Default is 30m
+    say_distance = 30
+
+    ; Distance in meters that shouts should travel.  Default is 100m
+    shout_distance = 100
+
+
+[Messaging]
+    ; Control which region module is used for instant messaging.
+    ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
+    InstantMessageModule = InstantMessageModule
+    ; MessageTransferModule = MessageTransferModule
+    ; OfflineMessageModule = OfflineMessageModule
+    ; OfflineMessageURL = http://yourserver/Offline.php
+    ; MuteListModule = MuteListModule
+    ; MuteListURL = http://yourserver/Mute.php
+
+    ; Control whether group messages are forwarded to offline users.  Default is true.
+    ; ForwardOfflineGroupMessages = true
+
+
+[ODEPhysicsSettings]
+    ;##
+    ;## World Settings
+    ;##
+
+    ;Gravity.  Feel like falling up?  change world_gravityz to 9.8 instead of -9.8.  m/s
+    world_gravityx = 0
+    world_gravityy = 0
+    world_gravityz = -9.8
+
+    ; World Step size. (warning these are dangerous.  Changing these will probably cause your scene to explode dramatically)
+    ; reference: fps = (0.09375/ODE_STEPSIZE) * 1000;
+    world_stepsize = 0.020
+    world_internal_steps_without_collisions = 10
+
+    ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
+    world_hashspace_size_low = -4
+    world_hashSpace_size_high = 128
+
+    ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
+    meters_in_small_space = 29.9
+    small_hashspace_size_low = -4
+    small_hashspace_size_high = 66
+
+    ; ##
+    ; ## Contact properties. (the stuff that happens when things come in contact with each other)
+    ; ##
+
+    ; surface layer around geometries other geometries can sink into before generating a contact
+    world_contact_surface_layer = 0.001
+
+    ; Filtering collisions helps keep things stable physics wise, but sometimes
+    ; it can be overzealous.  If you notice bouncing, chances are it's that.
+    filter_collisions = false
+
+    ; Non Moving Terrain Contact (avatar isn't moving)
+    nm_terraincontact_friction = 255.0
+    nm_terraincontact_bounce = 0.1
+    nm_terraincontact_erp = 0.1025
+
+    ; Moving Terrain Contact (avatar is moving)
+    m_terraincontact_friction = 75.0
+    m_terraincontact_bounce = 0.05
+    m_terrainContact_erp = 0.05025
+
+    ; Moving Avatar to object Contact
+    m_avatarobjectcontact_friction = 75.0
+    m_avatarobjectcontact_bounce = 0.1
+
+    ; Object to Object Contact and Non-Moving Avatar to object
+    objectcontact_friction = 250.0
+    objectcontact_bounce = 0.2
+
+    ; ##
+    ; ## Avatar Control
+    ; ##
+
+    ; PID Controller Settings. These affect the math that causes the avatar to reach the
+    ; desired velocity
+    ; See http://en.wikipedia.org/wiki/PID_controller
+
+    av_pid_derivative_linux = 2200.0
+    av_pid_proportional_linux = 900.0;
+
+    av_pid_derivative_win = 2200.0
+    av_pid_proportional_win = 900.0;
+
+    ;girth of the avatar.  Adds radius to the height also
+    av_capsule_radius = 0.37
+
+    ; Max force permissible to use to keep the avatar standing up straight
+    av_capsule_standup_tensor_win = 550000
+    av_capsule_standup_tensor_linux = 550000
+
+    ; specifies if the capsule should be tilted (=true; old compatibility mode)
+    ; or straight up-and-down (=false; better and more consistent physics behavior)
+    av_capsule_tilted = false
+
+    ; used to calculate mass of avatar.
+    ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
+    ; av_density * AVvolume;
+    av_density = 80
+
+    ; use this value to cut 52% of the height the sim gives us
+    av_height_fudge_factor = 0.52
+
+    ; Movement.  Smaller is faster.
+
+    ; speed of movement with Always Run off
+    av_movement_divisor_walk = 1.3
+
+    ; speed of movement with Always Run on
+    av_movement_divisor_run = 0.8
+
+    ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
+    minimum_ground_flight_offset = 3.0
+
+    ; ##
+    ; ## Object options
+    ; ##
+
+    ; used in the mass calculation.
+    geometry_default_density = 10.000006836
+
+    ; amount of ODE steps where object is non moving for ODE to automatically put it to sleep
+    body_frames_auto_disable = 20
+
+    ; used to control llMove2Target
+    body_pid_derivative = 35
+    body_pid_gain = 25
+
+    ; maximum number of contact points to generate per collision
+    contacts_per_collision = 80
+
+    ; amount of time a geom/body will try to cross a region border before it gets disabled
+    geom_crossing_failures_before_outofbounds = 5
+
+    ; start throttling the object updates if object comes in contact with 3 or more other objects
+    geom_contactpoints_start_throttling = 3
+
+    ; send 1 update for every x updates below when throttled
+    geom_updates_before_throttled_update = 15
+
+    ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
+    body_motor_joint_maxforce_tensor_linux = 5
+    body_motor_joint_maxforce_tensor_win = 5
+
+    ; Maximum mass an object can be before it is clamped
+    maximum_mass_object = 10000.01
+
+    ; ##
+    ; ## Sculpted Prim settings
+    ; ##
+
+    ; Do we want to mesh sculpted prim to collide like they look?
+    mesh_sculpted_prim = true
+
+    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
+    mesh_lod = 32
+
+    ; number^2 physical level of detail of the sculpt texture.  16x16 - 256 verticies
+    mesh_physical_lod = 16
+
+    ; ##
+    ; ## Physics logging settings - logfiles are saved to *.DIF files
+    ; ##
+
+    ; default is false
+    ;physics_logging = true
+    ;; every n simulation iterations, the physics snapshot file is updated
+    ;physics_logging_interval = 50
+    ;; append to existing physics logfile, or overwrite existing logfiles?
+    ;physics_logging_append_existing_logfile = true
+
+    ; ##
+    ; ## Joint support
+    ; ##
+
+    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
+    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
+    ; default is false
+    ;use_NINJA_physics_joints = true
+
+    ; ##
+    ; ## additional meshing options
+    ; ##
+
+    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
+    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
+    ; true. Note that this will increase memory usage and region startup time. Default is false.
+    ;force_simple_prim_meshing = true
+
+
+[RemoteAdmin]
+    enabled = false
+
+    ; Set this to a nonzero value to have remote admin use a different port
+    port = 0
+
+    ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
+    access_password = unknown
+
+    ; set this variable to true if you want the create_region XmlRpc
+    ; call to unconditionally enable voice on all parcels for a newly
+    ; created region [default: false]
+    create_region_enable_voice = false
+
+    ; set this variable to false if you want the create_region XmlRpc
+    ; call to create all regions as private per default (can be
+    ; overridden in the XmlRpc call) [default: true]
+    create_region_public = false
+
+    ; the create_region XmlRpc call uses region_file_template to generate
+    ; the file name of newly create regions (if they are created
+    ; persistent). the parameter available are:
+    ;     {0} - X location
+    ;     {1} - Y location
+    ;     {2} - region UUID
+    ;     {3} - region port
+    ;     {4} - region name with " ", ":", "/" mapped to  "_"
+    region_file_template = "{0}x{1}-{2}.ini"
+
+    ; we can limit the number of regions that XmlRpcCreateRegion will
+    ; allow by setting this to a positive, non-0 number: as long as the
+    ; number of regions is below region_limits, XmlRpcCreateRegion will
+    ; succeed. setting region_limit to 0 disables the check.
+    ; default is 0
+    ;region_limit = 0
+
+    ; enable only those methods you deem to be appropriate using a | delimited whitelist
+    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
+    ; if this parameter is not specified but enabled = true, all methods will be available
+    enabled_methods = all
+
+    ; specify the default appearance for an avatar created through the remote admin interface
+    ; This will only take effect is the file specified by the default_appearance setting below exists
+    ;default_male = Default Male
+    ;default_female = Default Female
+
+    ; update appearance copies inventory items and wearables of default avatars. if this value is false
+    ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
+    ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
+    ;copy_folders = false
+
+    ; path to default appearance XML file that specifies the look of the default avatars
+    ;default_appearance = default_appearance.xml 
+
+[RestPlugins]
+    ; Change this to true to enable REST Plugins. This must be true if you wish to use
+    ; REST Region or REST Asset and Inventory Plugins
+    enabled = false
+    god_key = SECRET
+    prefix = /admin
+
+
+[RestRegionPlugin]
+    ; Change this to true to enable the REST Region Plugin
+    enabled = false
+
+
+[RestHandler]
+    ; Change this to true to enable the REST Asset and Inventory Plugin
+    enabled = false
+    authenticate = true
+    secured = true
+    extended-escape = true
+    realm = OpenSim REST
+    dump-asset = false
+    path-fill = true
+    dump-line-size = 32
+    flush-on-error = true
+
+
+; Uncomment the following for IRC bridge
+; experimental, so if it breaks... keep both parts... yada yada
+; also, not good error detection when it fails
+;[IRC]
+    ;enabled = true ; you need to set this otherwise it won't connect
+    ;server  = name.of.irc.server.on.the.net
+    ;; user password - only use this if the server requires one
+    ;password = mypass
+    ;nick    = OpenSimBotNameProbablyMakeThisShorter
+    ;channel = #the_irc_channel_you_want_to_connect_to
+    ;user    = "USER OpenSimBot 8 * :I'm an OpenSim to IRC bot"
+    ;port = 6667
+    ;; channel to listen for configuration commands
+    ;commands_enabled = false
+    ;command_channel = 2777
+    ;report_clients = true
+    ;; relay private chat connections
+    ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
+    ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
+    ;; relay_private_channel_in -- channel to receive message from the IRC bridge
+    ;; relay_chat = false: IRC bridge will not relay normal chat
+    ;; access_password -- simple security device
+    ;;
+    ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
+    ;;
+    ;;     relay_private_channels = false
+    ;;     relay_chat = true
+    ;;
+    ;; to relay chat only to/from private in-world channels:
+    ;;
+    ;;     relay_chat = false
+    ;;     relay_private_channels = true
+    ;;     relay_private_channel_in = 2226
+    ;;     relay_private_channel_out = 2225
+    ;;
+    ;; in this example, all chat coming in from IRC will be send out via
+    ;; in-world channel 2226, and all chat from in-world channel 2225 will
+    ;; be relayed to the IRC channel.
+    ;;
+    ;relay_private_channels = false
+    ;relay_private_channel_in = 2226
+    ;relay_private_channel_out = 2225
+    ;relay_chat = true
+    ;access_password = foobar
+
+    ;;fallback_region = name of "default" region
+    ;;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
+    ;; must start with "PRIVMSG {0} : " or irc server will get upset
+    ;;for <bot>:<user in region> :<message>
+    ;;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
+    ;;for <bot>:<message> - <user of region> :
+    ;msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
+    ;;for <bot>:<message> - from <user> :
+    ;;msgformat = "PRIVMSG {0} : {3} - from {1}"
+
+    ;; exclude_list allows you to stop the IRC connector from announcing the
+    ;;arrival and departure of certain users. For example: admins, bots.
+
+    ;exclude_list=User 1,User 2,User 3
+
+
+;[CMS]
+    ;enabled = true
+    ;channel = 345
+
+
+; Uncomment the following to control the progression of daytime
+; in the Sim.  The defaults are what is shown below
+;[Sun]
+    ; number of wall clock hours for an opensim day.  24.0 would mean realtime
+    ;day_length = 4
+    ; Year length in days
+    ;year_length = 60
+    ; Day to Night Ratio
+    ;day_night_offset = 0.45
+    ; send a Sun update every update_interval # of frames.  A lower number will
+    ; make for smoother sun transition at the cost of network
+    ;update_interval = 100
+
+
+[Wind]
+    ; Enables the wind module.  Default is true
+    enabled = true
+
+    ; How often should wind be updated, as a function of world frames.  Approximately 50 frames a second
+    wind_update_rate = 150
+
+    ; The Default Wind Plugin to load
+    wind_plugin = SimpleRandomWind
+
+    ; These settings are specific to the ConfigurableWind plugin
+    ; To use ConfigurableWind as the default, simply change wind_plugin to ConfigurableWind and uncomment the following.
+    ; avg_strength  = 5.0
+    ; avg_direction = 0.0
+    ; var_strength  = 0.0
+    ; var_direction = 0.0
+    ; rate_change   = 1.0
+
+    ; This setting is specific to the SimpleRandomWind plugin
+    ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
+    strength = 1.0
+
+
+[Cloud]
+    ; Enable this to generate classic particle clouds above the sim.
+    ; default is disabled - turn it on here
+    enabled = false
+
+    ; Density of cloud cover 0.0 to 1.0 Defult 0.5
+    density = 0.5
+
+    ; update interval for the cloud cover data returned by llCloud().
+    ; default is 1000
+    cloud_update_rate = 1000
+
+[LightShare]
+
+    ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
+    ; It has no ill effect on viewers which do not support server-side windlight settings.
+    ; Currently we only have support for MySQL databases.
+    enable_windlight = false;
+
+[Trees]
+    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
+    ; default is false
+    active_trees = false
+
+    ; Density of tree population
+    tree_density = 1000.0
+
+
+[VectorRender]
+
+    ; the font to use for rendering text (default: Arial)
+    ; font_name = "Arial"
+
+
+[LL-Functions]
+    ; Set the following to true to allow administrator owned scripts to execute console commands
+    ; currently unused
+    ; AllowosConsoleCommand=false
+
+    AllowGodFunctions = false
+
+    ; Maximum number of llListen events we allow per script
+    ; Set this to 0 to have no limit imposed.
+    max_listens_per_script = 64
+
+
+[DataSnapshot]
+    ; The following set of configs pertains to search.
+    ; Set index_sims to true to enable search engines to index your searchable data
+    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
+    ; default is false
+    index_sims = false
+
+    ; The variable data_exposure controls what the regions expose:
+    ;    minimum: exposes only things explicitly marked for search
+    ;    all: exposes everything
+    data_exposure = minimum
+
+    ; If search is on, change this to your grid name; will be ignored for standalones
+    gridname = "OSGrid"
+
+    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
+    ; Later, you may want to increase this to 3600 (1 hour) or more
+    default_snapshot_period = 1200
+
+    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
+    snapshot_cache_directory = "DataSnapshot"
+
+    ; This semicolon-separated string serves to notify specific data services about the existence
+    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
+    ;data_services="http://metaverseink.com/cgi-bin/register.py"
+
+
+[Economy]
+    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
+
+    ; Enables selling things for $0
+    SellEnabled = "false"
+
+    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
+    ObjectCapacity = 45000
+
+    ; Money Unit fee to upload textures, animations etc
+    PriceUpload = 0
+
+    ; Money Unit fee to create groups
+    PriceGroupCreate = 0
+
+    ; We don't really know what the rest of these values do.  These get sent to the client
+    ; These taken from Agni at a Public Telehub.  Change at your own risk.
+    ObjectCount = 0
+    PriceEnergyUnit = 100
+    PriceObjectClaim = 10
+    PricePublicObjectDecay = 4
+    PricePublicObjectDelete = 4
+    PriceParcelClaim = 1
+    PriceParcelClaimFactor = 1
+
+    PriceRentLight = 5
+    TeleportMinPrice = 2
+    TeleportPriceExponent = 2
+    EnergyEfficiency = 1
+    PriceObjectRent = 1
+    PriceObjectScaleFactor = 10
+    PriceParcelRent = 1
+
+
+[SVN]
+    Enabled = false
+    Directory = SVNmodule\repo
+    URL = "svn://your.repo.here/"
+    Username = "user"
+    Password = "password"
+    ImportOnStartup = false
+    Autosave = false
+    AutoSavePeriod = 15 ; Number of minutes between autosave backups
+
+
+[XEngine]
+    ; Enable this engine in this OpenSim instance
+    Enabled = true
+
+    ; How many threads to keep alive even if nothing is happening
+    MinThreads = 2
+
+    ; How many threads to start at maximum load
+    MaxThreads = 100
+
+    ; Time a thread must be idle (in seconds) before it dies
+    IdleTimeout = 60
+
+    ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
+    Priority = "BelowNormal"
+
+    ; Maximum number of events to queue for a script (excluding timers)
+    MaxScriptEventQueue = 300
+
+    ; Stack size per thread created
+    ThreadStackSize = 262144
+
+    ; Set this to true (the default) to load each script into a separate
+    ; AppDomain. Setting this to false will load all script assemblies into the
+    ; current AppDomain, which will reduce the per-script overhead at the
+    ; expense of reduced security and the inability to garbage collect the
+    ; script assemblies
+    AppDomainLoading = true
+
+    ; Rate to poll for asynchronous command replies (ms)
+    ; currently unused
+    ;AsyncLLCommandLoopms = 50
+
+    ; Save the source of all compiled scripts
+    WriteScriptSourceToDebugFile = false
+
+    ; Default language for scripts
+    DefaultCompileLanguage = lsl
+
+    ; List of allowed languages (lsl,vb,js,cs)
+    ; AllowedCompilers=lsl,cs,js,vb.
+    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
+    AllowedCompilers=lsl
+
+    ; Compile debug info (line numbers) into the script assemblies
+    CompileWithDebugInformation = true
+
+    ; Allow the user of mod* functions.  This allows a script to pass messages
+    ; to a region module via the modSendCommand() function
+    ; Default is false
+    AllowMODFunctions = false
+
+    ; Allow the use of os* functions (some are dangerous)
+    AllowOSFunctions = false
+    
+    ; Allow the user of LightShare functions
+    AllowLightShareFunctions = false
+
+    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    OSFunctionThreatLevel = VeryLow
+
+    ; Interval (s) between background save of script states
+    SaveInterval = 120
+
+    ; Interval (s) between maintenance runs (0 = disable)
+    MaintenanceInterval = 10
+
+    ; Time a script can spend in an event handler before it is interrupted
+    EventLimit = 30
+
+    ; If a script overruns it's event limit, kill the script?
+    KillTimedOutScripts = false
+
+    ; Sets the multiplier for the scripting delays
+    ScriptDelayFactor = 1.0
+
+    ; The factor the 10 m distances llimits are multiplied by
+    ScriptDistanceLimitFactor = 1.0
+
+    ; Maximum length of notecard line read
+    ; Increasing this to large values potentially opens
+    ; up the system to malicious scripters
+    ; NotecardLineReadCharsMax = 255
+
+    ; Sensor settings
+    SensorMaxRange = 96.0
+    SensorMaxResults = 16
+
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
+    ; Allow for llCreateLink and llBreakLink to work without asking for permission
+    ; only enable this in a trusted environment otherwise you may be subject to hijacking
+    ; AutomaticLinkPermission = false
+
+    ; Disable underground movement of prims (default true); set to
+    ; false to allow script controlled underground positioning of
+    ; prims
+    ; DisableUndergroundMovement = true
+
+
+[OpenGridProtocol]
+    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
+    ;On/true or Off/false
+    ogp_enabled=false
+
+    ;Name Prefix/suffix when using OGP
+    ogp_firstname_prefix=""
+    ogp_lastname_suffix="_EXTERNAL"
+
+
+[Concierge]
+    ; Enable concierge module
+    ; Default is false
+    enabled = false
+
+    ; name of the concierge
+    whoami = "jeeves"
+
+    ; password for updating the welcome message templates via XmlRpc
+    password = SECRET
+
+    ; regex specifying for which regions concierge service is desired; if
+    ; empty, then for all
+    regions = "^MeetingSpace-"
+
+    ; for each region that matches the regions regexp you can provide
+    ; (optionally) a welcome template using format substitution:
+    ; {0} is replaced with the name of the avatar entering the region
+    ; {1} is replaced with the name of the region
+    ; {2} is replaced with the name of the concierge (whoami variable above)
+
+    welcomes = /path/to/welcome/template/directory
+
+    ; Concierge can send attendee lists to an event broker whenever an
+    ; avatar enters or leaves a concierged region. the URL is subject
+    ; to format substitution:
+    ; {0} is replaced with the region's name
+    ; {1} is replaced with the region's UUID
+    broker = "http://broker.place.com/{1}"
+
+
+[RegionReady]
+    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
+    ; default is false
+    enabled = false
+
+    ; Channel on which to signal region readiness through a message
+    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
+    ; - the first field indicating whether this is an initial server startup
+    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
+    ; - the third field is a number indicating how many scripts failed to compile
+    ; - "oar error" if supplied, provides the error message from the OAR load
+    channel_notify = -800
+
+
+[MRM]
+    ; Enables the Mini Region Modules Script Engine.
+    ; default is false
+    Enabled = false
+
+    ; Runs MRM in a Security Sandbox
+    ; WARNING: DISABLING IS A SECURITY RISK.
+    Sandboxed = true
+
+    ; The level sandbox to use, adjust at your OWN RISK.
+    ; Valid values are:
+    ; *  FullTrust
+    ; *  SkipVerification
+    ; *  Execution
+    ; *  Nothing
+    ; *  LocalIntranet
+    ; *  Internet
+    ; *  Everything
+    SandboxLevel = "Internet"
+
+    ; Only allow Region Owners to run MRMs
+    ; May represent a security risk if you disable this.
+    OwnerOnly = true
+
+[Hypergrid]
+    ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
+    safemode = false
+
+[VivoxVoice]
+    ; The VivoxVoice module will allow you to provide voice on your
+    ; region(s). It uses the same voice technology as the LL grid and
+    ; works with recent LL clients (we have tested 1.22.9.110075, so
+    ; anything later ought to be fine as well).
+    ;
+    ; For this to work you need to obtain an admin account from Vivox
+    ; that allows you to create voice accounts and region channels.
+
+    enabled = false
+
+    ; vivox voice server
+    vivox_server = www.foobar.vivox.com
+
+    ; vivox SIP URI
+    vivox_sip_uri = foobar.vivox.com
+
+    ; vivox admin user name
+    vivox_admin_user = DeepThroat
+
+    ; vivox admin password
+    vivox_admin_password = VoiceG4te
+
+    ; channel type: "channel" or "positional"
+    ; - positional: spatial sound (default)
+    ; - channel: normal "conference call", no spatial sound
+    ;vivox_channel_type = positional
+
+    ; channel characteristics (unless you know what you are doing, i'd
+    ; leave them as they are --- now you WILL muck around with them,
+    ; huh? sigh)
+
+    ; channel distance model:
+    ; 0 - no attenuation
+    ; 1 - inverse distance attenuation
+    ; 2 - linear attenuation (default)
+    ; 3 - exponential attenuation
+    ;vivox_channel_distance_model = 2
+
+    ; channel mode:
+    ; - "open" (default)
+    ; - "lecture"
+    ; - "presentation"
+    ; - "auditorium"
+    ;vivox_channel_mode = "open"
+
+    ; channel roll off: rate of attenuation
+    ; - a value between 1.0 and 4.0, default is 2.0
+    ;vivox_channel_roll_off = 2.0
+
+    ; channel max range: distance at which channel is silent
+    ; - a value between 0 and 160, default is 80
+    ;vivox_channel_max_range = 80
+
+    ; channel clamping distance: distance before attenuation applies
+    ; - a value between 0 and 160, default is 10
+    ;vivox_channel_clamping_distance = 10
+
+[FreeSwitchVoice]
+    ; In order for this to work you need a functioning FreeSWITCH PBX set up.
+    ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
+    enabled = false
+    ; FreeSWITCH server is going to contact us and ask us all sorts of things
+    freeswitch_server_user = freeswitch
+    freeswitch_server_pass = password
+    freeswitch_api_prefix = /api
+    ; external IP address of your OpenSim voice enabled region
+    ; note: all regions running on same OpenSim.exe will be enabled
+    freeswitch_service_server = ip.address.of.your.sim
+    ; this should be the same port the region listens on
+    freeswitch_service_port = 9000
+    freeswitch_realm = ip.address.of.freeswitch.server
+    freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
+    ; 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
+    freeswitch_attempt_stun = false
+    freeswitch_stun_server = ip.address.of.stun.server
+    freeswitch_echo_server = ip.address.of.freeswitch.server
+    freeswitch_echo_port = 50505
+    freeswitch_well_known_ip = ip.address.of.freeswitch.server
+    ;
+    ; Type the address of your http server here, hostname is allowed.  This is provided so you can specify a hostname
+    ; This is used by client for account verification.  By default, it's the same as the freeswitch service server.
+    ;
+    ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
+    ;
+    freeswitch_default_timeout = 5000
+    freeswitch_subscribe_retry = 120
+    ; freeswitch_password_reset_url =
+
+[Groups]
+    Enabled = false
+
+    ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
+    ; apply to the Flotsam/SimianGrid GroupsModule
+    Module  = Default
+
+    ; This module can use a PHP XmlRpc server from the Flotsam project at http://code.google.com/p/flotsam/
+    ; or from the SimianGrid project at http://code.google.com/p/openmetaverse
+    ;Module  = GroupsModule
+
+    ; Enable Group Notices
+    ;NoticesEnabled   = true 
+
+    ; This makes the Groups modules very chatty on the console.
+    DebugEnabled     = false
+
+    ; Specify which messaging module to use for groups messaging and if it's enabled
+    ;MessagingModule = GroupsMessagingModule
+    ;MessagingEnabled = true 
+
+    ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+  
+    ; SimianGrid Service for Groups
+    ;ServicesConnectorModule = SimianGroupsServicesConnector
+    ;GroupsServerURI = http://mygridserver.com:82/Grid/
+
+    ; Flotsam XmlRpc Service for Groups
+    ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
+    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
+
+    ; XmlRpc Security settings.  These must match those set on your backend groups service.
+    ;XmlRpcServiceReadKey    = 1234 
+    ;XmlRpcServiceWriteKey   = 1234 
+
+    ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
+    ; this is a work around fora problem discovered on some Windows based region servers.
+    ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
+    ; System.Net.WebException: The request was aborted: The request was canceled.
+    ; XmlRpcDisableKeepAlive = false
+
+
+[PacketPool]
+    ; Enables the experimental packet pool. Yes, we've been here before.
+    ;RecyclePackets = true;
+    ;RecycleDataBlocks = true;
+
+
+[InterestManagement]
+     ; This section controls how state updates are prioritized for each client
+     ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack
+     UpdatePrioritizationScheme = FrontBack
+     ReprioritizationEnabled = true
+     ReprioritizationInterval = 2000.0
+     RootReprioritizationDistance = 10.0
+     ChildReprioritizationDistance = 20.0
+
+
+[WebStats]
+; View region statistics via a web page
+; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+; Use a web browser and type in the "Login URI" + "/SStats/"
+; For example- http://127.0.0.1:9000/SStats/
+; enabled=false
+
+
+[MediaOnAPrim]
+    ; Enable media on a prim facilities
+    Enabled = true;
+
+
+;;
+;; These are defaults that are overwritten below in [Architecture].
+;; These defaults allow OpenSim to work out of the box with
+;; zero configuration
+;;
+[AssetService]
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ; Disable this to prevent the default asset set from being inserted into the
+    ; asset store each time the region starts
+    AssetLoaderEnabled = true
+
+[GridService]
+    ;; default standalone, overridable in StandaloneCommon.ini
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;; The following is the configuration section for the new style services
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Architecture]
+    ; Choose exactly one and only one of the architectures below.
+
+    Include-Standalone      = "config-include/Standalone.ini"
+    ;Include-HGStandalone    = "config-include/StandaloneHypergrid.ini"
+    ;Include-Grid            = "config-include/Grid.ini"
+    ;Include-HGGrid          = "config-include/GridHypergrid.ini"
+    ;Include-SimianGrid      = "config-include/SimianGrid.ini"
+    ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
+
+    ; Then choose
+    ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
+    ; config-include/GridCommon.ini.example (if you're connected to a grid)
+    ; Copy to your own .ini there (without .example extension) and edit it
+    ; to customize your data
+
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;; The below pulls in optional module config files
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Modules]
+    Include-modules = "addon-modules/*/config/*.ini"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; ENSURE [Architecture] and [Modules] Sections with their "includes"
+;; are last to allow for overrides
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.1


From 5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 Sep 2010 03:30:07 +0100
Subject: Revert "Move OpenSimDefaults,ini into config-include in order to put
 it with all the other default files"

This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.

Reverted by agreement.
---
 bin/config-include/OpenSimDefaults.ini | 1299 --------------------------------
 1 file changed, 1299 deletions(-)
 delete mode 100644 bin/config-include/OpenSimDefaults.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/OpenSimDefaults.ini b/bin/config-include/OpenSimDefaults.ini
deleted file mode 100644
index 8d714ce..0000000
--- a/bin/config-include/OpenSimDefaults.ini
+++ /dev/null
@@ -1,1299 +0,0 @@
-[Startup]
-    ; Set this to true if you want to log crashes to disk
-    ; this can be useful when submitting bug reports.
-    save_crashes = false
-
-    ; Directory to save crashes to if above is enabled
-    ; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
-    crash_dir = "crashes"
-
-    ; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
-
-    ; Http proxy support for llHTTPRequest and dynamic texture loading
-    ; Set HttpProxy to the URL for your proxy server if you would like
-    ; to proxy llHTTPRequests through a firewall
-    ; HttpProxy = "http://proxy.com"
-    ; Set HttpProxyExceptions to a list of regular expressions for
-    ; URLs that you don't want going through the proxy such as servers
-    ; inside your firewall, separate patterns with a ';'
-    ; HttpProxyExceptions = ".mydomain.com;localhost"
-
-    startup_console_commands_file = "startup_commands.txt"
-    shutdown_console_commands_file = "shutdown_commands.txt"
-
-    ; To run a script every few minutes, set the script filename here
-    ; timer_Script = "filename"
-
-    ; ##
-    ; ## SYSTEM
-    ; ##
-
-    ; Sets the method that OpenSim will use to fire asynchronous
-    ; events. Valid values are UnsafeQueueUserWorkItem,
-    ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
-    ; SmartThreadPool is reported to work well on Mono/Linux, but
-    ; UnsafeQueueUserWorkItem has been benchmarked with better
-    ; performance on .NET/Windows
-    async_call_method = SmartThreadPool
-
-    ; Max threads to allocate on the FireAndForget thread pool
-    ; when running with the SmartThreadPool option above
-    MaxPoolThreads = 15
-
-    ; ##
-    ; ## CLIENTS
-    ; ##
-
-    ; Enables EventQueueGet Service.
-    EventQueue = true
-
-    ; Set this to the DLL containing the client stack to use.
-    clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
-
-    ; ##
-    ; ## REGIONS
-    ; ##
-
-    ; Determine where OpenSimulator looks for the files which tell it which regions to server
-    ; Defaults to "filesystem" if this setting isn't present
-    region_info_source = "filesystem"
-    ; region_info_source = "web"
-
-    ; Determines where the region XML files are stored if you are loading these from the filesystem.
-    ; Defaults to bin/Regions in your OpenSimulator installation directory
-    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
-
-    ; Determines the page from which regions xml is retrieved if you are loading these from the web
-    ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
-    ; except that everything is also enclosed in a <Regions> tag.
-    ; regionload_webserver_url = "http://example.com/regions.xml";
-
-    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = false
-
-    ; Maximum total size, and maximum size where a prim can be physical
-    NonPhysicalPrimMax = 256
-    PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
-    ClampPrimSize = false
-
-    ; Allow scripts to cross region boundaries.  These are recompiled on the new region.
-    AllowScriptCrossing = false
-
-    ; Allow compiled script binary code to cross region boundaries.
-    ; If you set this to "true", any region that can teleport to you can
-    ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
-    ; YOU HAVE BEEN WARNED!!!
-    TrustBinaries = false
-
-    ; Combine all contiguous regions into one large megaregion
-    ; Order your regions from South to North, West to East in your regions.ini and then set this to true
-    ; Warning!  Don't use this with regions that have existing content!, This will likely break them
-    CombineContiguousRegions = false
-
-    ; If you have only one region in an instance, or to avoid the many bugs
-    ; that you can trigger in modules by restarting a region, set this to
-    ; true to make the entire instance exit instead of restarting the region.
-    ; This is meant to be used on systems where some external system like
-    ; Monit will restart any instance that exits, thereby making the shutdown
-    ; into a restart.
-    ;InworldRestartShutsDown = false
-
-    ; ##
-    ; ## PRIM STORAGE
-    ; ##
-
-    ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
-    ; prevent frequently changing objects from heavily loading the region data store.
-    ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
-    ;
-    ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
-    MinimumTimeBeforePersistenceConsidered = 60
-    ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
-    MaximumTimeBeforePersistenceConsidered = 600
-
-    ; Should avatars in neighbor sims see objects in this sim?
-    see_into_this_sim_from_neighbor = true
-
-    ; ##
-    ; ## PHYSICS
-    ; ##
-
-    ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
-    physical_prim = true
-
-    ; Select a mesher here.
-    ;
-    ; Meshmerizer properly handles complex prims by using triangle meshes.
-    ; Note that only the ODE physics engine currently deals with meshed prims in a satisfactory way
-    ;
-    ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
-    ; Usually this is only a box
-
-    meshing = Meshmerizer
-    ;meshing = ZeroMesher
-
-    ; Choose one of the physics engines below
-    ; OpenDynamicsEngine is by some distance the most developed physics engine
-    ; basicphysics effectively does not model physics at all, making all objects phantom
-
-    physics = OpenDynamicsEngine
-    ;physics = basicphysics
-    ;physics = POS
-    ;physics = modified_BulletX
-
-    ; ##
-    ; ## PERMISSIONS
-    ; ##
-
-    ;permissionmodules = "DefaultPermissionsModule"
-
-    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
-    ; any item, etc.  This may not yet be implemented uniformally.
-    ; If set to true, then all permissions checks are carried out
-    ; Default is false
-    serverside_object_permissions = false
-
-    allow_grid_gods = false
-
-    ; This allows somne control over permissions
-    ; please note that this still doesn't duplicate SL, and is not intended to
-    ;region_owner_is_god = true
-    ;region_manager_is_god = false
-    ;parcel_owner_is_god = true
-
-    ; Control user types that are allowed to create new scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can create scripts (subject to normal permissions)
-    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
-    ; Default value is all
-    ; allowed_script_creators = all
-
-    ; Control user types that are allowed to edit (save) scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can edit scripts (subject to normal permissions)
-    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
-    ; Default value is all
-    ; allowed_script_editors = all
-
-    ; ##
-    ; ## SCRIPT ENGINE
-    ; ##
-
-    DefaultScriptEngine = "XEngine"
-
-    ; ##
-    ; ## WORLD MAP
-    ; ##
-
-    ;WorldMapModule = "WorldMap"
-    ;MapImageModule = "MapImageModule"
-    ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = "true"
-    ; Refresh (in seconds) the map tile periodically
-    ;MaptileRefresh = 0
-    ; If not generating maptiles, use this static texture asset ID
-    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
-
-    ; ##
-    ; ## EMAIL MODULE
-    ; ##
-
-    ;emailmodule = DefaultEmailModule
-
-    ; ##
-    ; ## ANIMATIONS
-    ; ##
-
-    ; If enabled, enableFlySlow will change the primary fly state to
-    ; FLYSLOW, and the "always run" state will be the regular fly.
-
-    enableflyslow = false
-
-    ; PreJump is an additional animation state, but it probably
-    ; won't look right until the physics engine supports it
-    ; (i.e delays takeoff for a moment)
-
-    ; This is commented so it will come on automatically once it's
-    ; supported.
-
-    ; enableprejump = true
-
-    ; Simulator Stats URI
-    ; Enable JSON simulator data by setting a URI name (case sensitive)
-    ; Stats_URI = "jsonSimStats"
-
-    ; Make OpenSim start all regions woth logins disabled. They will need
-    ; to be enabled from the console if this is set
-    ; StartDisabled = false
-
-    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
-    ; OpenJPEG if false
-    ; UseCSJ2K = true
-
-[SMTP]
-    enabled=false
-
-    ;enabled=true
-    ;internal_object_host=lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
-    ;SMTP_SERVER_PORT=25
-    ;SMTP_SERVER_LOGIN=foo
-    ;SMTP_SERVER_PASSWORD=bar
-
-[Network]
-    ConsoleUser = "Test"
-    ConsolePass = "secret"
-    http_listener_port = 9000
-    console_port = 0
-
-    ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
-    ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
-    ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
-    http_listener_ssl = false ; Also create a SSL server
-    http_listener_cn = "localhost" ; Use the cert with the common name
-    http_listener_sslport = 9001 ; Use this port for SSL connections
-    http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
-
-    ; Hostname to use in llRequestURL/llRequestSecureURL
-    ; if not defined - default machine name is being used
-    ; (on Windows this mean NETBIOS name - useably only inside local network)
-    ; ExternalHostNameForLSL=127.0.0.1
-
-    ; What is reported as the "X-Secondlife-Shard"
-    ; Defaults to the user server url if not set
-    ; The old default is "OpenSim", set here for compatibility
-    shard = "OpenSim"
-
-    ; What is reported as the "User-Agent" when using llHTTPRequest
-    ; Defaults to not sent if not set here. See the notes section in the wiki at
-    ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
-    ; " (Mozilla Compatible)" to the text where there are problems with a web server
-    ;user_agent = "OpenSim LSL (Mozilla Compatible)"
-
-[XMLRPC]
-    ; ##
-    ; ## Scripting XMLRPC mapper
-    ; ##
-
-    ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
-    ; script concurrently with the first remote_data event.
-    ; This will contain the fully qualified URI an external site needs
-    ; to use to send XMLRPC requests to that script
-
-    ;XmlRpcRouterModule = "XmlRpcRouterModule"
-    ;XmlRpcPort = 20800
-
-[ClientStack.LindenUDP]
-    ; Set this to true to process incoming packets asynchronously. Networking is
-    ; already separated from packet handling with a queue, so this will only
-    ; affect whether networking internals such as packet decoding and
-    ; acknowledgement accounting are done synchronously or asynchronously
-    ;
-    ;async_packet_handling = false
-
-    ; The client socket receive buffer size determines how many
-    ; incoming requests we can process; the default on .NET is 8192
-    ; which is about 2 4k-sized UDP datagrams. On mono this is
-    ; whatever the underlying operating system has as default; for
-    ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
-    ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
-    ; do "sysctl net.core.rmem_default" to find out what your system
-    ; uses a default socket receive buffer size.
-    ;
-    ; client_socket_rcvbuf_size allows you to specify the receive
-    ; buffer size LLUDPServer should use. NOTE: this will be limited
-    ; by the system's settings for the maximum client receive buffer
-    ; size (on linux systems you can set that with "sysctl -w
-    ; net.core.rmem_max=X")
-    ;
-    ;client_socket_rcvbuf_size = 8388608
-
-    ; Maximum outbound bytes per second for a single scene. This can be used to
-    ; throttle total outbound UDP traffic for a simulator. The default value is
-    ; 0, meaning no throttling at the scene level. The example given here is
-    ; 20 megabits
-    ;
-    ;scene_throttle_max_bps = 2621440
-
-    ; Maximum bits per second to send to any single client. This will override
-    ; the user's viewer preference settings. The default value is 0, meaning no
-    ; aggregate throttling on clients (only per-category throttling). The
-    ; example given here is 1.5 megabits
-    ;
-    ;client_throttle_max_bps = 196608
-
-    ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overriden by clients
-    ;
-    ;resend_default = 12500
-    ;land_default = 1000
-    ;wind_default = 1000
-    ;cloud_default = 1000
-    ;task_default = 1000
-    ;texture_default = 1000
-    ;asset_default = 1000
-    ;state_default = 1000
-
-    ; Per-client maximum burst rates in bytes per second for the various
-    ; throttle categories. These are default values that will be overriden by
-    ; clients
-    ;
-    ;resend_limit = 18750
-    ;land_limit = 29750
-    ;wind_limit = 18750
-    ;cloud_limit = 18750
-    ;task_limit = 18750
-    ;texture_limit = 55750
-    ;asset_limit = 27500
-    ;state_limit = 37000
-
-    ; Configures how ObjectUpdates are aggregated. These numbers
-    ; do not literally mean how many updates will be put in each
-    ; packet that goes over the wire, as packets are
-    ; automatically split on a 1400 byte boundary. These control
-    ; the balance between responsiveness of interest list updates
-    ; and total throughput. Higher numbers will ensure more full-
-    ; sized packets and faster sending of data, but more delay in
-    ; updating interest lists
-    ;
-    ;PrimTerseUpdatesPerPacket = 25
-    ;AvatarTerseUpdatesPerPacket = 10
-    ;PrimFullUpdatesPerPacket = 100
-
-    ; TextureSendLimit determines how many packets will be put on
-    ; the outgoing queue each cycle. Like the settings above, this
-    ; is a balance between responsiveness to priority updates and
-    ; total throughput. Higher numbers will give a better
-    ; throughput at the cost of reduced responsiveness to client
-    ; priority changes or transfer aborts
-    ;
-    ;TextureSendLimit = 20
-
-    ; Quash and remove any light properties from attachments not on the
-    ; hands. This allows flashlights and lanterns to function, but kills
-    ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
-    ; will also be affected.
-    ;
-    ;DisableFacelights = "false"
-
-[Chat]
-    ; Controls whether the chat module is enabled.  Default is true.
-    enabled = true;
-
-    ; Distance in meters that whispers should travel.  Default is 10m
-    whisper_distance = 10
-
-    ; Distance in meters that ordinary chat should travel.  Default is 30m
-    say_distance = 30
-
-    ; Distance in meters that shouts should travel.  Default is 100m
-    shout_distance = 100
-
-
-[Messaging]
-    ; Control which region module is used for instant messaging.
-    ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
-    InstantMessageModule = InstantMessageModule
-    ; MessageTransferModule = MessageTransferModule
-    ; OfflineMessageModule = OfflineMessageModule
-    ; OfflineMessageURL = http://yourserver/Offline.php
-    ; MuteListModule = MuteListModule
-    ; MuteListURL = http://yourserver/Mute.php
-
-    ; Control whether group messages are forwarded to offline users.  Default is true.
-    ; ForwardOfflineGroupMessages = true
-
-
-[ODEPhysicsSettings]
-    ;##
-    ;## World Settings
-    ;##
-
-    ;Gravity.  Feel like falling up?  change world_gravityz to 9.8 instead of -9.8.  m/s
-    world_gravityx = 0
-    world_gravityy = 0
-    world_gravityz = -9.8
-
-    ; World Step size. (warning these are dangerous.  Changing these will probably cause your scene to explode dramatically)
-    ; reference: fps = (0.09375/ODE_STEPSIZE) * 1000;
-    world_stepsize = 0.020
-    world_internal_steps_without_collisions = 10
-
-    ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
-    world_hashspace_size_low = -4
-    world_hashSpace_size_high = 128
-
-    ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
-    meters_in_small_space = 29.9
-    small_hashspace_size_low = -4
-    small_hashspace_size_high = 66
-
-    ; ##
-    ; ## Contact properties. (the stuff that happens when things come in contact with each other)
-    ; ##
-
-    ; surface layer around geometries other geometries can sink into before generating a contact
-    world_contact_surface_layer = 0.001
-
-    ; Filtering collisions helps keep things stable physics wise, but sometimes
-    ; it can be overzealous.  If you notice bouncing, chances are it's that.
-    filter_collisions = false
-
-    ; Non Moving Terrain Contact (avatar isn't moving)
-    nm_terraincontact_friction = 255.0
-    nm_terraincontact_bounce = 0.1
-    nm_terraincontact_erp = 0.1025
-
-    ; Moving Terrain Contact (avatar is moving)
-    m_terraincontact_friction = 75.0
-    m_terraincontact_bounce = 0.05
-    m_terrainContact_erp = 0.05025
-
-    ; Moving Avatar to object Contact
-    m_avatarobjectcontact_friction = 75.0
-    m_avatarobjectcontact_bounce = 0.1
-
-    ; Object to Object Contact and Non-Moving Avatar to object
-    objectcontact_friction = 250.0
-    objectcontact_bounce = 0.2
-
-    ; ##
-    ; ## Avatar Control
-    ; ##
-
-    ; PID Controller Settings. These affect the math that causes the avatar to reach the
-    ; desired velocity
-    ; See http://en.wikipedia.org/wiki/PID_controller
-
-    av_pid_derivative_linux = 2200.0
-    av_pid_proportional_linux = 900.0;
-
-    av_pid_derivative_win = 2200.0
-    av_pid_proportional_win = 900.0;
-
-    ;girth of the avatar.  Adds radius to the height also
-    av_capsule_radius = 0.37
-
-    ; Max force permissible to use to keep the avatar standing up straight
-    av_capsule_standup_tensor_win = 550000
-    av_capsule_standup_tensor_linux = 550000
-
-    ; specifies if the capsule should be tilted (=true; old compatibility mode)
-    ; or straight up-and-down (=false; better and more consistent physics behavior)
-    av_capsule_tilted = false
-
-    ; used to calculate mass of avatar.
-    ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
-    ; av_density * AVvolume;
-    av_density = 80
-
-    ; use this value to cut 52% of the height the sim gives us
-    av_height_fudge_factor = 0.52
-
-    ; Movement.  Smaller is faster.
-
-    ; speed of movement with Always Run off
-    av_movement_divisor_walk = 1.3
-
-    ; speed of movement with Always Run on
-    av_movement_divisor_run = 0.8
-
-    ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
-    minimum_ground_flight_offset = 3.0
-
-    ; ##
-    ; ## Object options
-    ; ##
-
-    ; used in the mass calculation.
-    geometry_default_density = 10.000006836
-
-    ; amount of ODE steps where object is non moving for ODE to automatically put it to sleep
-    body_frames_auto_disable = 20
-
-    ; used to control llMove2Target
-    body_pid_derivative = 35
-    body_pid_gain = 25
-
-    ; maximum number of contact points to generate per collision
-    contacts_per_collision = 80
-
-    ; amount of time a geom/body will try to cross a region border before it gets disabled
-    geom_crossing_failures_before_outofbounds = 5
-
-    ; start throttling the object updates if object comes in contact with 3 or more other objects
-    geom_contactpoints_start_throttling = 3
-
-    ; send 1 update for every x updates below when throttled
-    geom_updates_before_throttled_update = 15
-
-    ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
-    body_motor_joint_maxforce_tensor_linux = 5
-    body_motor_joint_maxforce_tensor_win = 5
-
-    ; Maximum mass an object can be before it is clamped
-    maximum_mass_object = 10000.01
-
-    ; ##
-    ; ## Sculpted Prim settings
-    ; ##
-
-    ; Do we want to mesh sculpted prim to collide like they look?
-    mesh_sculpted_prim = true
-
-    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
-    mesh_lod = 32
-
-    ; number^2 physical level of detail of the sculpt texture.  16x16 - 256 verticies
-    mesh_physical_lod = 16
-
-    ; ##
-    ; ## Physics logging settings - logfiles are saved to *.DIF files
-    ; ##
-
-    ; default is false
-    ;physics_logging = true
-    ;; every n simulation iterations, the physics snapshot file is updated
-    ;physics_logging_interval = 50
-    ;; append to existing physics logfile, or overwrite existing logfiles?
-    ;physics_logging_append_existing_logfile = true
-
-    ; ##
-    ; ## Joint support
-    ; ##
-
-    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
-    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
-    ; default is false
-    ;use_NINJA_physics_joints = true
-
-    ; ##
-    ; ## additional meshing options
-    ; ##
-
-    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
-    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
-    ; true. Note that this will increase memory usage and region startup time. Default is false.
-    ;force_simple_prim_meshing = true
-
-
-[RemoteAdmin]
-    enabled = false
-
-    ; Set this to a nonzero value to have remote admin use a different port
-    port = 0
-
-    ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
-    access_password = unknown
-
-    ; set this variable to true if you want the create_region XmlRpc
-    ; call to unconditionally enable voice on all parcels for a newly
-    ; created region [default: false]
-    create_region_enable_voice = false
-
-    ; set this variable to false if you want the create_region XmlRpc
-    ; call to create all regions as private per default (can be
-    ; overridden in the XmlRpc call) [default: true]
-    create_region_public = false
-
-    ; the create_region XmlRpc call uses region_file_template to generate
-    ; the file name of newly create regions (if they are created
-    ; persistent). the parameter available are:
-    ;     {0} - X location
-    ;     {1} - Y location
-    ;     {2} - region UUID
-    ;     {3} - region port
-    ;     {4} - region name with " ", ":", "/" mapped to  "_"
-    region_file_template = "{0}x{1}-{2}.ini"
-
-    ; we can limit the number of regions that XmlRpcCreateRegion will
-    ; allow by setting this to a positive, non-0 number: as long as the
-    ; number of regions is below region_limits, XmlRpcCreateRegion will
-    ; succeed. setting region_limit to 0 disables the check.
-    ; default is 0
-    ;region_limit = 0
-
-    ; enable only those methods you deem to be appropriate using a | delimited whitelist
-    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
-    ; if this parameter is not specified but enabled = true, all methods will be available
-    enabled_methods = all
-
-    ; specify the default appearance for an avatar created through the remote admin interface
-    ; This will only take effect is the file specified by the default_appearance setting below exists
-    ;default_male = Default Male
-    ;default_female = Default Female
-
-    ; update appearance copies inventory items and wearables of default avatars. if this value is false
-    ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
-    ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
-    ;copy_folders = false
-
-    ; path to default appearance XML file that specifies the look of the default avatars
-    ;default_appearance = default_appearance.xml 
-
-[RestPlugins]
-    ; Change this to true to enable REST Plugins. This must be true if you wish to use
-    ; REST Region or REST Asset and Inventory Plugins
-    enabled = false
-    god_key = SECRET
-    prefix = /admin
-
-
-[RestRegionPlugin]
-    ; Change this to true to enable the REST Region Plugin
-    enabled = false
-
-
-[RestHandler]
-    ; Change this to true to enable the REST Asset and Inventory Plugin
-    enabled = false
-    authenticate = true
-    secured = true
-    extended-escape = true
-    realm = OpenSim REST
-    dump-asset = false
-    path-fill = true
-    dump-line-size = 32
-    flush-on-error = true
-
-
-; Uncomment the following for IRC bridge
-; experimental, so if it breaks... keep both parts... yada yada
-; also, not good error detection when it fails
-;[IRC]
-    ;enabled = true ; you need to set this otherwise it won't connect
-    ;server  = name.of.irc.server.on.the.net
-    ;; user password - only use this if the server requires one
-    ;password = mypass
-    ;nick    = OpenSimBotNameProbablyMakeThisShorter
-    ;channel = #the_irc_channel_you_want_to_connect_to
-    ;user    = "USER OpenSimBot 8 * :I'm an OpenSim to IRC bot"
-    ;port = 6667
-    ;; channel to listen for configuration commands
-    ;commands_enabled = false
-    ;command_channel = 2777
-    ;report_clients = true
-    ;; relay private chat connections
-    ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
-    ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
-    ;; relay_private_channel_in -- channel to receive message from the IRC bridge
-    ;; relay_chat = false: IRC bridge will not relay normal chat
-    ;; access_password -- simple security device
-    ;;
-    ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
-    ;;
-    ;;     relay_private_channels = false
-    ;;     relay_chat = true
-    ;;
-    ;; to relay chat only to/from private in-world channels:
-    ;;
-    ;;     relay_chat = false
-    ;;     relay_private_channels = true
-    ;;     relay_private_channel_in = 2226
-    ;;     relay_private_channel_out = 2225
-    ;;
-    ;; in this example, all chat coming in from IRC will be send out via
-    ;; in-world channel 2226, and all chat from in-world channel 2225 will
-    ;; be relayed to the IRC channel.
-    ;;
-    ;relay_private_channels = false
-    ;relay_private_channel_in = 2226
-    ;relay_private_channel_out = 2225
-    ;relay_chat = true
-    ;access_password = foobar
-
-    ;;fallback_region = name of "default" region
-    ;;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
-    ;; must start with "PRIVMSG {0} : " or irc server will get upset
-    ;;for <bot>:<user in region> :<message>
-    ;;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
-    ;;for <bot>:<message> - <user of region> :
-    ;msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
-    ;;for <bot>:<message> - from <user> :
-    ;;msgformat = "PRIVMSG {0} : {3} - from {1}"
-
-    ;; exclude_list allows you to stop the IRC connector from announcing the
-    ;;arrival and departure of certain users. For example: admins, bots.
-
-    ;exclude_list=User 1,User 2,User 3
-
-
-;[CMS]
-    ;enabled = true
-    ;channel = 345
-
-
-; Uncomment the following to control the progression of daytime
-; in the Sim.  The defaults are what is shown below
-;[Sun]
-    ; number of wall clock hours for an opensim day.  24.0 would mean realtime
-    ;day_length = 4
-    ; Year length in days
-    ;year_length = 60
-    ; Day to Night Ratio
-    ;day_night_offset = 0.45
-    ; send a Sun update every update_interval # of frames.  A lower number will
-    ; make for smoother sun transition at the cost of network
-    ;update_interval = 100
-
-
-[Wind]
-    ; Enables the wind module.  Default is true
-    enabled = true
-
-    ; How often should wind be updated, as a function of world frames.  Approximately 50 frames a second
-    wind_update_rate = 150
-
-    ; The Default Wind Plugin to load
-    wind_plugin = SimpleRandomWind
-
-    ; These settings are specific to the ConfigurableWind plugin
-    ; To use ConfigurableWind as the default, simply change wind_plugin to ConfigurableWind and uncomment the following.
-    ; avg_strength  = 5.0
-    ; avg_direction = 0.0
-    ; var_strength  = 0.0
-    ; var_direction = 0.0
-    ; rate_change   = 1.0
-
-    ; This setting is specific to the SimpleRandomWind plugin
-    ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
-    strength = 1.0
-
-
-[Cloud]
-    ; Enable this to generate classic particle clouds above the sim.
-    ; default is disabled - turn it on here
-    enabled = false
-
-    ; Density of cloud cover 0.0 to 1.0 Defult 0.5
-    density = 0.5
-
-    ; update interval for the cloud cover data returned by llCloud().
-    ; default is 1000
-    cloud_update_rate = 1000
-
-[LightShare]
-
-    ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
-    ; It has no ill effect on viewers which do not support server-side windlight settings.
-    ; Currently we only have support for MySQL databases.
-    enable_windlight = false;
-
-[Trees]
-    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
-    ; default is false
-    active_trees = false
-
-    ; Density of tree population
-    tree_density = 1000.0
-
-
-[VectorRender]
-
-    ; the font to use for rendering text (default: Arial)
-    ; font_name = "Arial"
-
-
-[LL-Functions]
-    ; Set the following to true to allow administrator owned scripts to execute console commands
-    ; currently unused
-    ; AllowosConsoleCommand=false
-
-    AllowGodFunctions = false
-
-    ; Maximum number of llListen events we allow per script
-    ; Set this to 0 to have no limit imposed.
-    max_listens_per_script = 64
-
-
-[DataSnapshot]
-    ; The following set of configs pertains to search.
-    ; Set index_sims to true to enable search engines to index your searchable data
-    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
-    ; default is false
-    index_sims = false
-
-    ; The variable data_exposure controls what the regions expose:
-    ;    minimum: exposes only things explicitly marked for search
-    ;    all: exposes everything
-    data_exposure = minimum
-
-    ; If search is on, change this to your grid name; will be ignored for standalones
-    gridname = "OSGrid"
-
-    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
-    ; Later, you may want to increase this to 3600 (1 hour) or more
-    default_snapshot_period = 1200
-
-    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
-
-    ; This semicolon-separated string serves to notify specific data services about the existence
-    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
-    ;data_services="http://metaverseink.com/cgi-bin/register.py"
-
-
-[Economy]
-    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
-
-    ; Enables selling things for $0
-    SellEnabled = "false"
-
-    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
-    ObjectCapacity = 45000
-
-    ; Money Unit fee to upload textures, animations etc
-    PriceUpload = 0
-
-    ; Money Unit fee to create groups
-    PriceGroupCreate = 0
-
-    ; We don't really know what the rest of these values do.  These get sent to the client
-    ; These taken from Agni at a Public Telehub.  Change at your own risk.
-    ObjectCount = 0
-    PriceEnergyUnit = 100
-    PriceObjectClaim = 10
-    PricePublicObjectDecay = 4
-    PricePublicObjectDelete = 4
-    PriceParcelClaim = 1
-    PriceParcelClaimFactor = 1
-
-    PriceRentLight = 5
-    TeleportMinPrice = 2
-    TeleportPriceExponent = 2
-    EnergyEfficiency = 1
-    PriceObjectRent = 1
-    PriceObjectScaleFactor = 10
-    PriceParcelRent = 1
-
-
-[SVN]
-    Enabled = false
-    Directory = SVNmodule\repo
-    URL = "svn://your.repo.here/"
-    Username = "user"
-    Password = "password"
-    ImportOnStartup = false
-    Autosave = false
-    AutoSavePeriod = 15 ; Number of minutes between autosave backups
-
-
-[XEngine]
-    ; Enable this engine in this OpenSim instance
-    Enabled = true
-
-    ; How many threads to keep alive even if nothing is happening
-    MinThreads = 2
-
-    ; How many threads to start at maximum load
-    MaxThreads = 100
-
-    ; Time a thread must be idle (in seconds) before it dies
-    IdleTimeout = 60
-
-    ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
-    Priority = "BelowNormal"
-
-    ; Maximum number of events to queue for a script (excluding timers)
-    MaxScriptEventQueue = 300
-
-    ; Stack size per thread created
-    ThreadStackSize = 262144
-
-    ; Set this to true (the default) to load each script into a separate
-    ; AppDomain. Setting this to false will load all script assemblies into the
-    ; current AppDomain, which will reduce the per-script overhead at the
-    ; expense of reduced security and the inability to garbage collect the
-    ; script assemblies
-    AppDomainLoading = true
-
-    ; Rate to poll for asynchronous command replies (ms)
-    ; currently unused
-    ;AsyncLLCommandLoopms = 50
-
-    ; Save the source of all compiled scripts
-    WriteScriptSourceToDebugFile = false
-
-    ; Default language for scripts
-    DefaultCompileLanguage = lsl
-
-    ; List of allowed languages (lsl,vb,js,cs)
-    ; AllowedCompilers=lsl,cs,js,vb.
-    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
-    AllowedCompilers=lsl
-
-    ; Compile debug info (line numbers) into the script assemblies
-    CompileWithDebugInformation = true
-
-    ; Allow the user of mod* functions.  This allows a script to pass messages
-    ; to a region module via the modSendCommand() function
-    ; Default is false
-    AllowMODFunctions = false
-
-    ; Allow the use of os* functions (some are dangerous)
-    AllowOSFunctions = false
-    
-    ; Allow the user of LightShare functions
-    AllowLightShareFunctions = false
-
-    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
-    OSFunctionThreatLevel = VeryLow
-
-    ; Interval (s) between background save of script states
-    SaveInterval = 120
-
-    ; Interval (s) between maintenance runs (0 = disable)
-    MaintenanceInterval = 10
-
-    ; Time a script can spend in an event handler before it is interrupted
-    EventLimit = 30
-
-    ; If a script overruns it's event limit, kill the script?
-    KillTimedOutScripts = false
-
-    ; Sets the multiplier for the scripting delays
-    ScriptDelayFactor = 1.0
-
-    ; The factor the 10 m distances llimits are multiplied by
-    ScriptDistanceLimitFactor = 1.0
-
-    ; Maximum length of notecard line read
-    ; Increasing this to large values potentially opens
-    ; up the system to malicious scripters
-    ; NotecardLineReadCharsMax = 255
-
-    ; Sensor settings
-    SensorMaxRange = 96.0
-    SensorMaxResults = 16
-
-    ; OS Functions enable/disable
-    ; For each function, you can add one line, as shown
-    ; The default for all functions allows them if below threat level
-
-    ; true allows the use of the function unconditionally
-    ; Allow_osSetRegionWaterHeight = true
-
-    ; false disables the function completely
-    ; Allow_osSetRegionWaterHeight = false
-
-    ; Comma separated list of UUIDS allows the function for that list of UUIDS
-    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-
-    ; You can also use script creators as the uuid
-    ; Creators_osSetRegionWaterHeight = <uuid>, ...
-
-    ; If both Allow_ and Creators_ are given, effective permissions
-    ; are the union of the two.
-
-    ; Allow for llCreateLink and llBreakLink to work without asking for permission
-    ; only enable this in a trusted environment otherwise you may be subject to hijacking
-    ; AutomaticLinkPermission = false
-
-    ; Disable underground movement of prims (default true); set to
-    ; false to allow script controlled underground positioning of
-    ; prims
-    ; DisableUndergroundMovement = true
-
-
-[OpenGridProtocol]
-    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
-    ;On/true or Off/false
-    ogp_enabled=false
-
-    ;Name Prefix/suffix when using OGP
-    ogp_firstname_prefix=""
-    ogp_lastname_suffix="_EXTERNAL"
-
-
-[Concierge]
-    ; Enable concierge module
-    ; Default is false
-    enabled = false
-
-    ; name of the concierge
-    whoami = "jeeves"
-
-    ; password for updating the welcome message templates via XmlRpc
-    password = SECRET
-
-    ; regex specifying for which regions concierge service is desired; if
-    ; empty, then for all
-    regions = "^MeetingSpace-"
-
-    ; for each region that matches the regions regexp you can provide
-    ; (optionally) a welcome template using format substitution:
-    ; {0} is replaced with the name of the avatar entering the region
-    ; {1} is replaced with the name of the region
-    ; {2} is replaced with the name of the concierge (whoami variable above)
-
-    welcomes = /path/to/welcome/template/directory
-
-    ; Concierge can send attendee lists to an event broker whenever an
-    ; avatar enters or leaves a concierged region. the URL is subject
-    ; to format substitution:
-    ; {0} is replaced with the region's name
-    ; {1} is replaced with the region's UUID
-    broker = "http://broker.place.com/{1}"
-
-
-[RegionReady]
-    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
-    ; default is false
-    enabled = false
-
-    ; Channel on which to signal region readiness through a message
-    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
-    ; - the first field indicating whether this is an initial server startup
-    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
-    ; - the third field is a number indicating how many scripts failed to compile
-    ; - "oar error" if supplied, provides the error message from the OAR load
-    channel_notify = -800
-
-
-[MRM]
-    ; Enables the Mini Region Modules Script Engine.
-    ; default is false
-    Enabled = false
-
-    ; Runs MRM in a Security Sandbox
-    ; WARNING: DISABLING IS A SECURITY RISK.
-    Sandboxed = true
-
-    ; The level sandbox to use, adjust at your OWN RISK.
-    ; Valid values are:
-    ; *  FullTrust
-    ; *  SkipVerification
-    ; *  Execution
-    ; *  Nothing
-    ; *  LocalIntranet
-    ; *  Internet
-    ; *  Everything
-    SandboxLevel = "Internet"
-
-    ; Only allow Region Owners to run MRMs
-    ; May represent a security risk if you disable this.
-    OwnerOnly = true
-
-[Hypergrid]
-    ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
-    safemode = false
-
-[VivoxVoice]
-    ; The VivoxVoice module will allow you to provide voice on your
-    ; region(s). It uses the same voice technology as the LL grid and
-    ; works with recent LL clients (we have tested 1.22.9.110075, so
-    ; anything later ought to be fine as well).
-    ;
-    ; For this to work you need to obtain an admin account from Vivox
-    ; that allows you to create voice accounts and region channels.
-
-    enabled = false
-
-    ; vivox voice server
-    vivox_server = www.foobar.vivox.com
-
-    ; vivox SIP URI
-    vivox_sip_uri = foobar.vivox.com
-
-    ; vivox admin user name
-    vivox_admin_user = DeepThroat
-
-    ; vivox admin password
-    vivox_admin_password = VoiceG4te
-
-    ; channel type: "channel" or "positional"
-    ; - positional: spatial sound (default)
-    ; - channel: normal "conference call", no spatial sound
-    ;vivox_channel_type = positional
-
-    ; channel characteristics (unless you know what you are doing, i'd
-    ; leave them as they are --- now you WILL muck around with them,
-    ; huh? sigh)
-
-    ; channel distance model:
-    ; 0 - no attenuation
-    ; 1 - inverse distance attenuation
-    ; 2 - linear attenuation (default)
-    ; 3 - exponential attenuation
-    ;vivox_channel_distance_model = 2
-
-    ; channel mode:
-    ; - "open" (default)
-    ; - "lecture"
-    ; - "presentation"
-    ; - "auditorium"
-    ;vivox_channel_mode = "open"
-
-    ; channel roll off: rate of attenuation
-    ; - a value between 1.0 and 4.0, default is 2.0
-    ;vivox_channel_roll_off = 2.0
-
-    ; channel max range: distance at which channel is silent
-    ; - a value between 0 and 160, default is 80
-    ;vivox_channel_max_range = 80
-
-    ; channel clamping distance: distance before attenuation applies
-    ; - a value between 0 and 160, default is 10
-    ;vivox_channel_clamping_distance = 10
-
-[FreeSwitchVoice]
-    ; In order for this to work you need a functioning FreeSWITCH PBX set up.
-    ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
-    enabled = false
-    ; FreeSWITCH server is going to contact us and ask us all sorts of things
-    freeswitch_server_user = freeswitch
-    freeswitch_server_pass = password
-    freeswitch_api_prefix = /api
-    ; external IP address of your OpenSim voice enabled region
-    ; note: all regions running on same OpenSim.exe will be enabled
-    freeswitch_service_server = ip.address.of.your.sim
-    ; this should be the same port the region listens on
-    freeswitch_service_port = 9000
-    freeswitch_realm = ip.address.of.freeswitch.server
-    freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
-    ; 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
-    freeswitch_attempt_stun = false
-    freeswitch_stun_server = ip.address.of.stun.server
-    freeswitch_echo_server = ip.address.of.freeswitch.server
-    freeswitch_echo_port = 50505
-    freeswitch_well_known_ip = ip.address.of.freeswitch.server
-    ;
-    ; Type the address of your http server here, hostname is allowed.  This is provided so you can specify a hostname
-    ; This is used by client for account verification.  By default, it's the same as the freeswitch service server.
-    ;
-    ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
-    ;
-    freeswitch_default_timeout = 5000
-    freeswitch_subscribe_retry = 120
-    ; freeswitch_password_reset_url =
-
-[Groups]
-    Enabled = false
-
-    ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
-    ; apply to the Flotsam/SimianGrid GroupsModule
-    Module  = Default
-
-    ; This module can use a PHP XmlRpc server from the Flotsam project at http://code.google.com/p/flotsam/
-    ; or from the SimianGrid project at http://code.google.com/p/openmetaverse
-    ;Module  = GroupsModule
-
-    ; Enable Group Notices
-    ;NoticesEnabled   = true 
-
-    ; This makes the Groups modules very chatty on the console.
-    DebugEnabled     = false
-
-    ; Specify which messaging module to use for groups messaging and if it's enabled
-    ;MessagingModule = GroupsMessagingModule
-    ;MessagingEnabled = true 
-
-    ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-  
-    ; SimianGrid Service for Groups
-    ;ServicesConnectorModule = SimianGroupsServicesConnector
-    ;GroupsServerURI = http://mygridserver.com:82/Grid/
-
-    ; Flotsam XmlRpc Service for Groups
-    ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
-    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
-
-    ; XmlRpc Security settings.  These must match those set on your backend groups service.
-    ;XmlRpcServiceReadKey    = 1234 
-    ;XmlRpcServiceWriteKey   = 1234 
-
-    ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
-    ; this is a work around fora problem discovered on some Windows based region servers.
-    ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
-    ; System.Net.WebException: The request was aborted: The request was canceled.
-    ; XmlRpcDisableKeepAlive = false
-
-
-[PacketPool]
-    ; Enables the experimental packet pool. Yes, we've been here before.
-    ;RecyclePackets = true;
-    ;RecycleDataBlocks = true;
-
-
-[InterestManagement]
-     ; This section controls how state updates are prioritized for each client
-     ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack
-     UpdatePrioritizationScheme = FrontBack
-     ReprioritizationEnabled = true
-     ReprioritizationInterval = 2000.0
-     RootReprioritizationDistance = 10.0
-     ChildReprioritizationDistance = 20.0
-
-
-[WebStats]
-; View region statistics via a web page
-; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
-; Use a web browser and type in the "Login URI" + "/SStats/"
-; For example- http://127.0.0.1:9000/SStats/
-; enabled=false
-
-
-[MediaOnAPrim]
-    ; Enable media on a prim facilities
-    Enabled = true;
-
-
-;;
-;; These are defaults that are overwritten below in [Architecture].
-;; These defaults allow OpenSim to work out of the box with
-;; zero configuration
-;;
-[AssetService]
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-    ; Disable this to prevent the default asset set from being inserted into the
-    ; asset store each time the region starts
-    AssetLoaderEnabled = true
-
-[GridService]
-    ;; default standalone, overridable in StandaloneCommon.ini
-    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The following is the configuration section for the new style services
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Architecture]
-    ; Choose exactly one and only one of the architectures below.
-
-    Include-Standalone      = "config-include/Standalone.ini"
-    ;Include-HGStandalone    = "config-include/StandaloneHypergrid.ini"
-    ;Include-Grid            = "config-include/Grid.ini"
-    ;Include-HGGrid          = "config-include/GridHypergrid.ini"
-    ;Include-SimianGrid      = "config-include/SimianGrid.ini"
-    ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
-
-    ; Then choose
-    ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
-    ; config-include/GridCommon.ini.example (if you're connected to a grid)
-    ; Copy to your own .ini there (without .example extension) and edit it
-    ; to customize your data
-
-
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The below pulls in optional module config files
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Modules]
-    Include-modules = "addon-modules/*/config/*.ini"
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; ENSURE [Architecture] and [Modules] Sections with their "includes"
-;; are last to allow for overrides
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.1


From 0d034712baac235df7aea019e259c101d9ff4517 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 15 Sep 2010 15:56:03 +0100
Subject: Make AuthorizationService optional and disabled by default. It
 depends on external PHP and the default configuration makes it throw for not
 having a URL to this PHP

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4a6a082..1794573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,7 +14,6 @@
     AvatarServices			= "RemoteAvatarServicesConnector"
     NeighbourServices		= "RemoteNeighbourServicesConnector"
     AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "RemoteAuthorizationServicesConnector"
     PresenceServices		= "RemotePresenceServicesConnector"
     UserAccountServices		= "RemoteUserAccountServicesConnector"
     GridUserServices		= "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index c2cd5c3..3ab11b8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -93,3 +93,6 @@
     ;; Optionally, the port for the LLProxyLoginModule module can be changed
     
     ;Setup_LLProxyLoginModule = "9090/"
+
+    ;; Authorization is not on by default, as it depends on external php
+    ;AuthorizationServices	= "RemoteAuthorizationServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d69a945..cb9ead4 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,7 +17,6 @@
     AvatarServices			= "RemoteAvatarServicesConnector"
     NeighbourServices		= "RemoteNeighbourServicesConnector"
     AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "RemoteAuthorizationServicesConnector"
     PresenceServices		= "RemotePresenceServicesConnector"
     UserAccountServices		= "RemoteUserAccountServicesConnector"
     GridUserServices		= "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 96ef602..a810393 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -40,6 +40,9 @@
     ;; Enable this to use Freeswitch on a standalone
     ;FreeswitchServiceInConnector = True
 
+    ;; Authorization is not on by default, as it depends on external php
+    ;AuthorizationServices	= "LocalAuthorizationServicesConnector"
+
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
-- 
cgit v1.1


From 58f7a083f95c8f94e86aac5d0dfc57a06de1c543 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 17 Sep 2010 21:40:49 +0100
Subject: Add LandServices to make landmarks work right in grids

---
 bin/config-include/Grid.ini          | 1 +
 bin/config-include/GridHypergrid.ini | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 1794573..5624a38 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -20,6 +20,7 @@
     SimulationServices		= "RemoteSimulationConnectorModule"
     EntityTransferModule	= "BasicEntityTransferModule"
     InventoryAccessModule	= "BasicInventoryAccessModule"
+    LandServices            = "RemoteLandServicesConnector"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index cb9ead4..409b2a9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -23,6 +23,7 @@
     SimulationServices		= "RemoteSimulationConnectorModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
+    LandServices            = "RemoteLandServicesConnector"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
-- 
cgit v1.1


From eeca0ee0093bd29cbf9c7c845cb9a380f8320491 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 4 Oct 2010 17:10:07 -0400
Subject: Formatting cleanup.

---
 bin/config-include/CenomeCache.ini.example      |  6 +++---
 bin/config-include/FlotsamCache.ini.example     | 22 +++++++++++-----------
 bin/config-include/GridCommon.ini.example       | 12 ++++++------
 bin/config-include/Standalone.ini               | 17 ++++++++---------
 bin/config-include/StandaloneCommon.ini.example | 24 ++++++++++++------------
 5 files changed, 40 insertions(+), 41 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
index c7c901b..8ef4e03 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/bin/config-include/CenomeCache.ini.example
@@ -2,12 +2,12 @@
     ;;
     ;; Options for CenmoeAssetCache
     ;;
-    
+
     ; 256 MB (default: 134217728)
     MaxSize =  268435456
-    
+
     ; How many assets it is possible to store cache (default: 4096)
     MaxCount = 16384
-    
+
     ; Expiration time - 1 hour (default: 30 minutes)
     ExpirationTime = 60
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index b50d7ec..026dee7 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -2,7 +2,7 @@
     ;;
     ;; Options for FlotsamAssetCache
     ;;
-    
+
     ; cache directory can be shared by multiple instances
     CacheDirectory = ./assetcache
     ; Other examples:
@@ -34,9 +34,9 @@
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
     FileCleanupTimer = .166  ;roughly every 10 minutes
-    
-    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
-    ; long (in miliseconds) to block a request thread while trying to complete 
+
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
+    ; long (in miliseconds) to block a request thread while trying to complete
     ; an existing write to disk.
     ; WaitOnInprogressTimeout = 3000
 
@@ -50,10 +50,10 @@
 
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
-	
-	; Perform a deep scan of all assets within all regions, looking for all assets
-	; present or referenced.  Mark all assets found that are already present in the
-	; cache, and request all assets that are found that are not already cached (this
-	; will cause those assets to be cached)
-	;
-	; DeepScanBeforePurge = false
+
+    ; Perform a deep scan of all assets within all regions, looking for all assets
+    ; present or referenced.  Mark all assets found that are already present in the
+    ; cache, and request all assets that are found that are not already cached (this
+    ; will cause those assets to be cached)
+    ;
+    ; DeepScanBeforePurge = false
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3ab11b8..cb771b8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -11,8 +11,8 @@
     ; for more details
     ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
 
-    ; MySql  
-    ; Uncomment these lines if you want to use mysql storage 
+    ; MySql
+    ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
@@ -81,18 +81,18 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
-        
+
     AssetCaching = "FlotsamAssetCache"
     Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
     ;AssetCaching = "CenomeMemoryAssetCache"
     ;Include-CenomeCache = "config-include/CenomeCache.ini"
-    
+
     ;AssetCaching = "GlynnTuckerAssetCache"
 
     ;; Optionally, the port for the LLProxyLoginModule module can be changed
-    
+
     ;Setup_LLProxyLoginModule = "9090/"
 
     ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices	= "RemoteAuthorizationServicesConnector"
+    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d74b50e..6355d09 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,10 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    
-    LibraryModule				= true
-    LLLoginServiceInConnector	= true
-    GridInfoServiceInConnector	= true
+
+    LibraryModule              = true
+    LLLoginServiceInConnector  = true
+    GridInfoServiceInConnector = true
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -35,9 +35,9 @@
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [LibraryService]
-  	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	  LibraryName = "OpenSim Library"
-	  DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -78,7 +78,7 @@
 [LoginService]
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService		  = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -88,7 +88,6 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a810393..2f021d5 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -13,8 +13,8 @@
     ; for more details
     ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
 
-    ; MySql  
-    ; Uncomment these lines if you want to use mysql storage 
+    ; MySql
+    ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
@@ -28,9 +28,9 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
-    
+
     ;AssetCaching = "GlynnTuckerAssetCache"
-    
+
     ;AssetCaching = "FlotsamAssetCache"
     ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
@@ -41,7 +41,7 @@
     ;FreeswitchServiceInConnector = True
 
     ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices	= "LocalAuthorizationServicesConnector"
+    ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
@@ -49,11 +49,11 @@
 
 [GridService]
     ;; For in-memory region storage (default)
-	  StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     ;;--- For MySql region storage (alternative)
- 	  ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+    ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
-	; If HG, do you want this check on the distance to be performed?
+    ; If HG, do you want this check on the distance to be performed?
     ; Check4096 = "False"
 
     ;; Next, we can specify properties of regions, including default and fallback regions
@@ -65,7 +65,7 @@
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
     ;LibraryName = "My World's Library"
-    
+
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
 
@@ -77,9 +77,9 @@
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
-	; Does this grid allow incoming links to any region in it? 
-	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
-	AllowTeleportsToAnyRegion = true
+    ; Does this grid allow incoming links to any region in it?
+    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+    AllowTeleportsToAnyRegion = true
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
-- 
cgit v1.1


From 78f6fe0b311fc43cbb98cebb385e20baced14a38 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 9 Oct 2010 09:09:16 -0700
Subject: Added missing sections to StandaloneHypergrid.ini

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 317af4b..f164d33 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -31,6 +31,12 @@
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [AssetService]
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
 
-- 
cgit v1.1


From 63bdfb1e28a9cc13cd94b98f598320e7da25d24f Mon Sep 17 00:00:00 2001
From: Marck
Date: Fri, 29 Oct 2010 11:01:50 +0200
Subject: Clarify comment for configuration option Check4096 and show the
 default value.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2f021d5..1fcf043 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -53,8 +53,8 @@
     ;;--- For MySql region storage (alternative)
     ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
-    ; If HG, do you want this check on the distance to be performed?
-    ; Check4096 = "False"
+    ;; With hypergrid, perform distance check for the creation of a linked region
+    ; Check4096 = true
 
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
-- 
cgit v1.1


From 2368aab534a9534f5f2806d5a4ffeb75950fdafd Mon Sep 17 00:00:00 2001
From: Marck
Date: Thu, 11 Nov 2010 11:08:57 +0100
Subject: Fix: Write asset data into Asset.db when using SQLite

---
 bin/config-include/storage/SQLiteLegacyStandalone.ini | 3 +++
 bin/config-include/storage/SQLiteStandalone.ini       | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
index facbbd6..ffe9a70 100644
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini
@@ -4,6 +4,9 @@
     StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
 
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index 10e6991..c1de71a 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -4,6 +4,9 @@
     StorageProvider = "OpenSim.Data.SQLite.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below
-- 
cgit v1.1


From ae4b02e1152b775dc1cdccd1abfbff44ab1a8949 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Nov 2010 11:14:16 -0800
Subject: WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG
 CONFIGS. Added capability to preserve creator information on HG asset
 transfers. Added a new HGAssetService that is intended to be the one outside
 the firewall. It processes and filters the assets that go out of the grid.
 Also fixed the normal AssetService to do special things for the main instance
 (console commands, etc). Moved HGInventoryService to
 OpenSim.Services.HypergridService. Changed the way the login service gets the
 ServiceURL configs.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1fcf043..d002d49 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -25,6 +25,13 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
+[HGInventoryService]
+    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+
+[HGAssetService]
+    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+
+
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
@@ -68,11 +75,12 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-
-    HomeURI = "http://127.0.0.1:9000"
     GatekeeperURI = "http://127.0.0.1:9000"
-    InventoryServerURI = "http://127.0.0.1:9000"
-    AssetServerURI = "http://127.0.0.1:9000"
+
+    SRV_HomeURI = "http://127.0.0.1:9000"    
+    SRV_InventoryServerURI = "http://127.0.0.1:9000"
+    SRV_AssetServerURI = "http://127.0.0.1:9000"
+    SRV_ProfileServerURI = "http://127.0.0.1:9000"
 
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f164d33..68aa739 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -128,8 +128,14 @@
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
     ; For the InventoryServiceInConnector
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+;; The interface that local users get when they are in other grids
+;; This restricts/filters the asset operations from the outside
+[HGAssetService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
+    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 ;; This should always be the very last thing on this file
 [Includes]
-- 
cgit v1.1


From 3292a2255882018b7fed3e80f430dc26892b92ea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Nov 2010 22:06:34 -0800
Subject: Creator information preserved upon HG transfers.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index cb771b8..762b09a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -78,6 +78,14 @@
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
+[HGInventoryAccessModule]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your profile server 
+    ; accessible from other grids
+    ;
+    ProfileServerURI = "http://mygridserver.com:8002/profiles"
+
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d002d49..58059f5 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -31,6 +31,8 @@
 [HGAssetService]
     ProfileServerURI = "http://127.0.0.1:9000/profiles"
 
+[HGInventoryAccessModule]
+    ProfileServerURI = "http://127.0.0.1:9000/profiles"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-- 
cgit v1.1


From 3675bb29816e43e7831db14ba07c86ef0cb158da Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 9 Dec 2010 09:30:17 -0800
Subject: Make configs consistent, as per mantos #5258

---
 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 762b09a..1122cbd 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -84,7 +84,7 @@
     ; Change this to your profile server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/profiles"
+    ProfileServerURI = "http://mygridserver.com:8002/user"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-- 
cgit v1.1


From 9a24c0b41c786f49766c212c656f8162e4c263ef Mon Sep 17 00:00:00 2001
From: Marck
Date: Mon, 13 Dec 2010 21:19:33 +0100
Subject: Show map tile for hyperlinks. Perform Check4096 before adding a
 hyperlink.

Configuration option AssetService in section [GridService] must be set to enable this functionality.

Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270.
---
 bin/config-include/GridCommon.ini.example       |  3 +++
 bin/config-include/GridHypergrid.ini            |  9 ++++++---
 bin/config-include/StandaloneCommon.ini.example |  3 +++
 bin/config-include/StandaloneHypergrid.ini      | 11 +++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 1122cbd..761e5eb 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -42,6 +42,9 @@
     GridServerURI = "http://mygridserver.com:8003"
     ;AllowHypergridMapSearch = true
 
+    ;; Directory for map tile images of linked regions
+    ; MapTileDirectory = "./"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 409b2a9..e983755 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,12 +44,15 @@
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
 
 [GridService]
-	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
-	; which in turn uses this
+    ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+    ; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-	AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for linked regions
+    AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+
+    AllowHypergridMapSearch = true
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 58059f5..4956bc3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -65,6 +65,9 @@
     ;; With hypergrid, perform distance check for the creation of a linked region
     ; Check4096 = true
 
+    ;; Directory for map tile images of remote regions
+    ; MapTileDirectory = "./"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 68aa739..486f22e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -65,12 +65,15 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
 [GridService]
-	; LocalGridServicesConnector needs this
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-	Realm = "regions"
+    ; LocalGridServicesConnector needs this
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
 	
-	AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for remote regions
+    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+  
+    AllowHypergridMapSearch = true
 	
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-- 
cgit v1.1


From f801d50a8a2df43b3b4d99ebf32de603e4cfa226 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 27 Dec 2010 15:25:08 -0800
Subject: WARNING: simulator config var change! This affects only system-facing
 configs. Nothing to do if you follow the rules of not messing with Grid.ini
 and GridHypergrid.ini. Change the remote Grid region module so that it takes
 the network connector as a config variable. This allows the region plugin to
 be reused for both Robust and Simian network connectors.

---
 bin/config-include/Grid.ini            | 2 ++
 bin/config-include/GridHypergrid.ini   | 2 ++
 bin/config-include/HyperSimianGrid.ini | 5 +++--
 bin/config-include/SimianGrid.ini      | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5624a38..ce5588e 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -37,6 +37,8 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+	NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e983755..5142d90 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -49,6 +49,8 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
+    NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 29b51de..0b01116 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,7 +21,7 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "SimianGridServiceConnector"
+    GridServices = "RemoteGridServicesConnector"
     PresenceServices = "SimianPresenceServiceConnector"
     UserAccountServices = "SimianUserAccountServiceConnector"
     AuthenticationServices = "SimianAuthenticationServiceConnector"
@@ -53,7 +53,8 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    
+    NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 239ce30..311a55b 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,7 +21,7 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "SimianGridServiceConnector"
+    GridServices = "RemoteGridServicesConnector"
     PresenceServices = "SimianPresenceServiceConnector"
     UserAccountServices = "SimianUserAccountServiceConnector"
     AuthenticationServices = "SimianAuthenticationServiceConnector"
@@ -53,6 +53,7 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+	NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-- 
cgit v1.1


From f5a3eb9fd547df043b00a2934d891dcfff3142ab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Feb 2011 17:05:45 -0800
Subject: Added a config var to HGInventoryAccessModule called
 OutboundPermission that controls whether the sim lets asset POSTs happen to
 foreign grids or not. It's True by default. If ppl want to allow foreign
 visitors but don't want to allow any assets out of their grid, they should
 set this to False. This is the beginning of policies for these things...

---
 bin/config-include/GridCommon.ini.example       |  4 ++++
 bin/config-include/HyperSimianGrid.ini          | 11 +++++++++++
 bin/config-include/StandaloneCommon.ini.example |  4 ++++
 3 files changed, 19 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 761e5eb..e1bcf00 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -88,6 +88,10 @@
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
+	;; 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
+
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 0b01116..89d6be7 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -82,3 +82,14 @@
 
 [Profiles]
     Module = "SimianProfiles"
+
+[HGInventoryAccessModule]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your profile server 
+    ; accessible from other grids
+    ;
+    ProfileServerURI = "http://mygridserver.com:8002/user"
+	;; 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 4956bc3..213219c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -33,6 +33,10 @@
 
 [HGInventoryAccessModule]
     ProfileServerURI = "http://127.0.0.1:9000/profiles"
+	;; 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
+
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-- 
cgit v1.1


From 5c15c5e0ffa2da1bbc57e590d05ca19d46470f89 Mon Sep 17 00:00:00 2001
From: Marck
Date: Wed, 16 Feb 2011 17:42:01 +0100
Subject: Changed default directory for storing map tile images from remote
 regions.

---
 bin/config-include/GridCommon.ini.example       | 2 +-
 bin/config-include/StandaloneCommon.ini.example | 2 +-
 2 files changed, 2 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 e1bcf00..4dc0e53 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -43,7 +43,7 @@
     ;AllowHypergridMapSearch = true
 
     ;; Directory for map tile images of linked regions
-    ; MapTileDirectory = "./"
+    ; MapTileDirectory = "./maptiles"
 
 [AvatarService]
     ;
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 213219c..816e9a6 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -70,7 +70,7 @@
     ; Check4096 = true
 
     ;; Directory for map tile images of remote regions
-    ; MapTileDirectory = "./"
+    ; MapTileDirectory = "./maptiles"
 
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
-- 
cgit v1.1


From 2d209d3844a58a4d27fe15aa5ccd497bbd530707 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Mar 2011 16:46:04 -0700
Subject: Fix mantis #5413. WARNING: new config variable in section
 [GridService] of the simulators called Gatekeeper -- intended to have the URL
 of the grid's Gatekeeper service (so that it can be checked against). See
 ini.examples.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4dc0e53..a6fe4b1 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -45,6 +45,12 @@
     ;; Directory for map tile images of linked regions
     ; MapTileDirectory = "./maptiles"
 
+    ; === 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)
+	Gatekeeper="http://mygridserver.com:8002"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 816e9a6..995a33e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -78,6 +78,11 @@
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
+    ; === 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"
-- 
cgit v1.1


From 9d40c0dcc70462d78d6347676927b05eed245a9a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 7 Apr 2011 23:16:36 +0100
Subject: Remove the SQLite legacy adaptor.  This is no longer needed now that
 the main adaptor works on Mac OS X.

The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
---
 bin/config-include/GridCommon.ini.example            |  5 -----
 bin/config-include/StandaloneCommon.ini.example      |  5 -----
 .../storage/SQLiteLegacyStandalone.ini               | 20 --------------------
 3 files changed, 30 deletions(-)
 delete mode 100644 bin/config-include/storage/SQLiteLegacyStandalone.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a6fe4b1..bc8bc0f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -6,11 +6,6 @@
     ; SQLite
     Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
-    ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX.  You can still use the older
-    ; legacy sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini (search for sqlite)
-    ; for more details
-    ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
-
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 995a33e..d6f15bb 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -8,11 +8,6 @@
     ; SQLite
     Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
-    ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX.  You can still use the older
-    ; legacy sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini (search for sqlite)
-    ; for more details
-    ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
-
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
deleted file mode 100644
index ffe9a70..0000000
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; These are the initialization settings for running OpenSim Standalone with an SQLite database
-
-[DatabaseService]
-    StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
-    ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
-
-[AssetService]
-    ConnectionString = "URI=file:Asset.db,version=3"
-
-[AvatarService]
-    ConnectionString = "URI=file:avatars.db,version=3"
-
-[AuthenticationService]
-    ConnectionString = "URI=file:auth.db,version=3"
-
-[UserAccountService]
-    ConnectionString = "URI=file:userprofiles.db,version=3"
-
-[FriendsService]
-    ConnectionString = "URI=file:friends.db,version=3"
-- 
cgit v1.1


From 2fa210243b64bb10fbca37f89176f10efeb25f41 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Apr 2011 21:54:26 +0100
Subject: Clean up freeswitch config to what is currently required.  Add
 explanation to config parameters.  Clean up some log messages.

---
 bin/config-include/StandaloneCommon.ini.example | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d6f15bb..dcebd63 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -28,10 +28,10 @@
 
 [HGInventoryAccessModule]
     ProfileServerURI = "http://127.0.0.1:9000/profiles"
-	;; 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
 
+    ;; 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
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
@@ -45,16 +45,9 @@
     AssetCaching = "CenomeMemoryAssetCache"
     Include-CenomeCache = "config-include/CenomeCache.ini"
 
-    ;; Enable this to use Freeswitch on a standalone
-    ;FreeswitchServiceInConnector = True
-
     ;; Authorization is not on by default, as it depends on external php
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
-[FreeswitchService]
-    ;; Configuration for the freeswitch service goes here
-    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
-
 [GridService]
     ;; For in-memory region storage (default)
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
@@ -74,9 +67,8 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-	;; change this to the address of your simulator
-	Gatekeeper="http://127.0.0.1:9000"
-
+    ;; 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
-- 
cgit v1.1


From e0576b56d376d6bc7b9c5c3818acbdbcdb0dc56f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 27 Apr 2011 07:02:37 -0700
Subject: Thank you Snoopy for a patch that adds some filtering to client
 versions allowed at login and HG-login times. NOTE: additional (optional)
 configuration variables in [LoginService] and [GatekeeperService]. See
 .examples.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index dcebd63..67efa11 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -83,6 +83,23 @@
     SRV_AssetServerURI = "http://127.0.0.1:9000"
     SRV_ProfileServerURI = "http://127.0.0.1:9000"
 
+	;; Regular expressions for controlling which client versions are accepted/denied.
+	;; An empty string means nothing is checked.
+	;;
+	;; Example 1: allow only these 3 types of clients (any version of them)
+	;; AllowedClients = "Imprudence|Hippo|Second Life"
+	;;
+	;; Example 2: allow all clients except these
+	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+	;;
+	;; Note that these are regular expressions, so every character counts.
+	;; Also note that this is very weak security and should not be trusted as a reliable means
+	;; for keeping bad clients out; modified clients can fake their identifiers.
+	;;
+	;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
@@ -90,6 +107,23 @@
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
 
+	;; Regular expressions for controlling which client versions are accepted/denied.
+	;; An empty string means nothing is checked.
+	;;
+	;; Example 1: allow only these 3 types of clients (any version of them)
+	;; AllowedClients = "Imprudence|Hippo|Second Life"
+	;;
+	;; Example 2: allow all clients except these
+	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+	;;
+	;; Note that these are regular expressions, so every character counts.
+	;; Also note that this is very weak security and should not be trusted as a reliable means
+	;; for keeping bad clients out; modified clients can fake their identifiers.
+	;;
+	;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [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 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


From c7bdb66a1f02c968f61f82333751e7f144fb59d8 Mon Sep 17 00:00:00 2001
From: Makopoppo
Date: Thu, 9 Jun 2011 22:26:03 +0900
Subject: Added missing "Old Guids=true" to ConnectionString

---
 bin/config-include/GridCommon.ini.example | 4 ++--
 1 file changed, 2 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 e2e6459..27f262f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -10,9 +10,9 @@
     ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
     ; 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=***;"
+    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
     ; MSSQL
     ; Uncomment these lines if you want to use MSSQL storage
-- 
cgit v1.1


From b13b54c5268d8acada132b678946ceba925f6419 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 11 Jun 2011 00:04:21 +0100
Subject: Make the internal flotsam asset cache defaults match
 config-include/FlotsamCache.ini.example.  Enable the flotsam console commands
 even if FlotsamCache.ini isn't present.

For the most part, defaults are made to match those already in FlotsamCache.ini.example.
The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file.  This can be tweaked if necessary.
Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default).
Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
---
 bin/config-include/FlotsamCache.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index 026dee7..1f2bf03 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -29,7 +29,7 @@
 
     ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
     ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
+    FileCacheTimeout = 48
 
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
-- 
cgit v1.1


From c7cef650db6bbbabfefa7a2fb47a028147b7e822 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 11 Jun 2011 00:10:40 +0100
Subject: Make it clear that WaitOnInprogressTimeout is currently a dead
 setting in FlotsamCache.ini.example

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index 1f2bf03..ad38ad1 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -38,6 +38,7 @@
     ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
     ; long (in miliseconds) to block a request thread while trying to complete
     ; an existing write to disk.
+    ; NOTE: THIS PARAMETER IS NOT CURRENTLY USED BY THE CACHE
     ; WaitOnInprogressTimeout = 3000
 
     ; Number of tiers to use for cache directories (current valid
-- 
cgit v1.1


From 39e878eb8f23cdae67b917d16f3dfc8709abcd9c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 11 Jun 2011 00:35:31 +0100
Subject: Align CenomeCache.ini.example values with CenomeCache defaults.

---
 bin/config-include/CenomeCache.ini.example | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
index 8ef4e03..4340493 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/bin/config-include/CenomeCache.ini.example
@@ -1,13 +1,14 @@
 [AssetCache]
     ;;
-    ;; Options for CenmoeAssetCache
+    ;; Options for CenomeAssetCache
     ;;
 
-    ; 256 MB (default: 134217728)
-    MaxSize =  268435456
+    ; Max size of the cache in bytes
+    ; 134217728 = 128 MB, 26843556 = 256 MB, etc (default: 134217728)
+    MaxSize = 134217728
 
-    ; How many assets it is possible to store cache (default: 4096)
-    MaxCount = 16384
+    ; How many assets it is possible to store in the cache (default: 4096)
+    MaxCount = 4096
 
-    ; Expiration time - 1 hour (default: 30 minutes)
-    ExpirationTime = 60
+    ; Expiration time in minutes (default: 30)
+    ExpirationTime = 30
-- 
cgit v1.1


From fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 12 Jun 2011 15:37:42 -0700
Subject: First pass at making the V2 map work. Standalones only for now. There
 are some issues with the zoom level -- TBD.

---
 bin/config-include/Standalone.ini               |  7 +++++++
 bin/config-include/StandaloneCommon.ini.example |  3 +++
 bin/config-include/StandaloneHypergrid.ini      | 11 +++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 4ff1a26..bf89d0b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,12 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
+	MapImageService			= "MapImageServiceModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
+	MapImageServiceInConnector = true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -91,6 +93,11 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
+[MapImageService]
+	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+	; in minutes
+	RefreshTime = 60
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 7359bba..69349d2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -99,6 +99,9 @@
     SRV_FriendsServerURI = "http://127.0.0.1:9000"
     SRV_IMServerURI = "http://127.0.0.1:9000"
 
+	;; For Viewer 2
+	MapTileURL = "http://127.0.0.1:9000"
+
 	;; Regular expressions for controlling which client versions are accepted/denied.
 	;; An empty string means nothing is checked.
 	;;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 8480a77..719df5c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -18,9 +18,10 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices		= "RemoteSimulationConnectorModule"
     AvatarServices			= "LocalAvatarServicesConnector"
+	MapImageService			= "MapImageServiceModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
-    FriendsModule		= "HGFriendsModule"
+    FriendsModule			= "HGFriendsModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
@@ -31,6 +32,7 @@
 	GridInfoServiceInConnector			= true
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
+	MapImageServiceInConnector			= true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -116,7 +118,12 @@
     GridService				= "OpenSim.Services.GridService.dll:GridService"
     AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
-    
+   
+[MapImageService]
+	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+	; in minutes
+	RefreshTime = 60
+
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
-- 
cgit v1.1


From 07d7c1cd2d0d5ccf6d40a3616ecaeb565e9bfab4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 12 Jun 2011 18:29:44 -0700
Subject: Trailing / in MapTileURL must be there!

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 69349d2..29c2af1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -100,7 +100,7 @@
     SRV_IMServerURI = "http://127.0.0.1:9000"
 
 	;; For Viewer 2
-	MapTileURL = "http://127.0.0.1:9000"
+	MapTileURL = "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 ecb28ae130d1fc212c72af887fc75ae2bf64ab97 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 Jun 2011 09:13:44 -0700
Subject: V2 map now working in grids too. WARNING: A few visible configuration
 variables added in order for this to work. See .ini.example changes

---
 bin/config-include/Grid.ini               | 6 ++++++
 bin/config-include/GridCommon.ini.example | 3 +++
 bin/config-include/GridHypergrid.ini      | 8 +++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5220573..da860c6 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -21,6 +21,7 @@
     EntityTransferModule	= "BasicEntityTransferModule"
     InventoryAccessModule	= "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
+	MapImageService			= "MapImageServiceModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -50,3 +51,8 @@
 
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
+
+[MapImageService]
+	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+	; in minutes
+	RefreshTime = 60
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 27f262f..4eb6fcf 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -116,6 +116,9 @@
     ;
     UserAgentServerURI = "http://mygridserver.com:8002"
 
+[MapImageService]
+   	MapImageServerURI = "http://mygridserver.com:8003"
+
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index b8e66c2..60a3c62 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,6 +25,7 @@
     InventoryAccessModule	= "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
 	FriendsModule			= "HGFriendsModule"
+	MapImageService			= "MapImageServiceModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -76,4 +77,9 @@
 	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
+	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+
+[MapImageService]
+	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+	; in minutes
+	RefreshTime = 60
-- 
cgit v1.1


From bbe489e64a4c1bfdae591f3b6cf60ee0b1809176 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 15 Jun 2011 11:11:14 -0700
Subject: Added missing config var for map image service.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 29c2af1..cbe3fa0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -223,3 +223,7 @@
     ; password help: optional: page providing password assistance for users of your grid
     ; currently unused
     ;password = http://127.0.0.1/password
+
+[MapImageService]
+	; Set this if you want to change the default
+	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From de20f0603fa419ba16c56d16c2ad55301cad8b83 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jun 2011 19:49:05 +0100
Subject: Tell hypergridders when their teleports fail because of the 4096
 limit rather than just saying "destination not found"

Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit.  It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
---
 bin/config-include/StandaloneCommon.ini.example | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index cbe3fa0..ee0523f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -63,9 +63,6 @@
     ;;--- For MySql region storage (alternative)
     ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
-    ;; With hypergrid, perform distance check for the creation of a linked region
-    ; Check4096 = true
-
     ;; Directory for map tile images of remote regions
     ; MapTileDirectory = "./maptiles"
 
-- 
cgit v1.1


From bebc51a6e041d2bcd8fef110ea5b178ac614c59d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 4 Jul 2011 22:51:47 +0100
Subject: Make it possible to disable the file part of the flotsam asset cache

This matches the ability to disable the memory part
This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini
Default is true, so existing installations are not affected.
Improved fcache command feedback when various caches are disabled.
Re-enabled test for flotsam cache with file caching disabled.
---
 bin/config-include/FlotsamCache.ini.example | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index ad38ad1..cd39f8c 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -19,9 +19,12 @@
     ; 0 to disable
     HitRateDisplay = 100
 
-    ; Set to false for disk cache only.
+    ; Set to false for no memory cache
     MemoryCacheEnabled = false
 
+    ; Set to false for no file cache
+    FileCacheEnabled = true
+
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
     ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
     ; increases performance without large memory impact
-- 
cgit v1.1


From bf1b8397bb6a8dad5eba89b44c46412bbb948edd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 12 Jul 2011 23:35:06 +0100
Subject: Add a warning to URI config in GridCommon.ini.example not to add a
 slash to the end.

Tidy up GridCommon.ini.example
---
 bin/config-include/GridCommon.ini.example | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4eb6fcf..4e34059 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -28,19 +28,19 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
     ;
-    ; change this to your grid-wide asset server
+    ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
 [InventoryService]
     ;
-    ; change this to your grid-wide inventory server
+    ; Change this to your grid-wide inventory server
     ;
     InventoryServerURI = "http://myinventoryserver.com:8003"
 
 [GridService]
     ;
-    ; change this to your grid-wide grid server
+    ; Change this to your grid-wide grid server
     ;
     GridServerURI = "http://mygridserver.com:8003"
     ;AllowHypergridMapSearch = true
@@ -49,51 +49,51 @@
     ; MapTileDirectory = "./maptiles"
 
     ; === 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)
-	Gatekeeper="http://mygridserver.com:8002"
+    ;; 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"
 
 [Messaging]
     ; === HG ONLY ===
-    ;; change this to the address of your Gatekeeper service
+    ;; 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
+    ; Change this to your grid-wide grid server
     ;
     AvatarServerURI = "http://mygridserver.com:8003"
 
 [PresenceService]
     ;
-    ; change this to your grid-wide presence server
+    ; Change this to your grid-wide presence server
     ;
     PresenceServerURI = "http://mygridserver.com:8003"
 
 [UserAccountService]
     ;
-    ; change this to your grid-wide user accounts server
+    ; Change this to your grid-wide user accounts server
     ;
     UserAccountServerURI = "http://mygridserver.com:8003"
 
 [GridUserService]
     ;
-    ; change this to your grid-wide user accounts server
+    ; Change this to your grid-wide user accounts server
     ;
     GridUserServerURI = "http://mygridserver.com:8003"
 
 [AuthenticationService]
     ;
-    ; change this to your grid-wide authentication server
+    ; Change this to your grid-wide authentication server
     ;
     AuthenticationServerURI = "http://mygridserver.com:8003"
 
 [FriendsService]
     ;
-    ; change this to your grid-wide friends server
+    ; Change this to your grid-wide friends server
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
@@ -104,10 +104,10 @@
     ; 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
+    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
 
 [UserAgentService]
     ;
-- 
cgit v1.1


From 70ea62544716134447884e999898267497b85a12 Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer
Date: Sun, 14 Aug 2011 18:20:20 +0200
Subject: Added optional Login Service parameter "Currency" to be able to
 change the currency name shown in the viewer.

---
 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 ee0523f..babd116 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -99,6 +99,8 @@
 	;; For Viewer 2
 	MapTileURL = "http://127.0.0.1:9000/"
 
+    ;Currency = ""
+
 	;; Regular expressions for controlling which client versions are accepted/denied.
 	;; An empty string means nothing is checked.
 	;;
-- 
cgit v1.1


From 96ee87e39bf0310aa5648b04e1a5d47d5795daab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Aug 2011 21:38:51 +0100
Subject: Change the default standalone asset cache to be the Flotsam asset
 cache (with memory caching not enabled).

This matches the GridCommon setting and is the best tested setting.  It appears to work fine on standalone.
Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained.
---
 bin/config-include/GridCommon.ini.example       |  1 +
 bin/config-include/StandaloneCommon.ini.example | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4e34059..c5598c0 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -122,6 +122,7 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
     AssetCaching = "FlotsamAssetCache"
     Include-FlotsamCache = "config-include/FlotsamCache.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index babd116..431dce1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -45,14 +45,15 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
-    ;AssetCaching = "GlynnTuckerAssetCache"
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
-    ;AssetCaching = "FlotsamAssetCache"
-    ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
+    ;AssetCaching = "GlynnTuckerAssetCache"
 
-    AssetCaching = "CenomeMemoryAssetCache"
-    Include-CenomeCache = "config-include/CenomeCache.ini"
+    ; AssetCaching = "CenomeMemoryAssetCache"
+    ; Include-CenomeCache = "config-include/CenomeCache.ini"
 
     ;; Authorization is not on by default, as it depends on external php
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
-- 
cgit v1.1


From 2307d9a2f9e733fd2c18928a6aebdffb5e22c9a9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 22 Aug 2011 00:58:11 +0100
Subject: minor: Add explanative text for the new currency parameter.  Convert
 some tabs to spaces

---
 bin/config-include/StandaloneCommon.ini.example | 33 +++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 431dce1..c057887 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -97,25 +97,26 @@
     SRV_FriendsServerURI = "http://127.0.0.1:9000"
     SRV_IMServerURI = "http://127.0.0.1:9000"
 
-	;; For Viewer 2
-	MapTileURL = "http://127.0.0.1:9000/"
+    ;; For Viewer 2
+    MapTileURL = "http://127.0.0.1:9000/"
 
+    ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
-- 
cgit v1.1


From c4efb97d49dec736151dfa3fa102efe6a5f6fbab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Sep 2011 22:59:29 +0100
Subject: Write code to create minimum necessary body parts/clothing and avatar
 entries to make a newly created user appear as a non-cloud on viewer 2

Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off.  My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
---
 bin/config-include/Standalone.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf89d0b..8aaa154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -70,6 +70,7 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
-- 
cgit v1.1


From 37370a8102f066dab1fe3fd9b0b4a7d3541e8b47 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Sep 2011 00:30:37 +0100
Subject: On standalone, by default create the necessary minimum body parts and
 clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d
 This is controlled by the CreateDefaultAvatarEntries switch in the
 [UserAccountService] section of config-include/Stnadalone.ini This is left as
 false in grid mode

---
 bin/config-include/Standalone.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 8aaa154..6ad4ac9 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,12 +17,12 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-	MapImageService			= "MapImageServiceModule"
+    MapImageService			= "MapImageServiceModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
-	MapImageServiceInConnector = true
+    MapImageServiceInConnector = true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -72,6 +72,9 @@
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
+
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-- 
cgit v1.1


From 4b7b9e81f7b33c86f691e2bca756a3639fe9ee04 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 12 Oct 2011 15:41:59 +0100
Subject: Make it possible to disable the HG linker. On non-HG systems it spits
 yellow spam, so it should not load unless HG is desired.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 60a3c62..4c32498 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -26,6 +26,7 @@
     LandServices            = "RemoteLandServicesConnector"
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
+	HypergridLinker         = "HypergridLinker"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 89d6be7..ec4efc0 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -40,6 +40,7 @@
     LibraryModule = false
     
     AssetCaching = "FlotsamAssetCache"
+	HypergridLinker         = "HypergridLinker"
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 719df5c..f8c258a 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -22,6 +22,7 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
+	HypergridLinker         = "HypergridLinker"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
-- 
cgit v1.1


From 229ca09b7956f51fc2618dc35dff87cf04bf0fc9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 22 Oct 2011 02:47:53 +0100
Subject: Make config comments about choosing assetcache modules clearer.

OpenSim needs an asset cache.  Running without one will cause problems.
Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850
---
 bin/config-include/GridCommon.ini.example       |  2 ++
 bin/config-include/StandaloneCommon.ini.example | 34 ++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index c5598c0..72cd606 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,3 +1,5 @@
+; This is the main configuration file for an instance of OpenSim running in grid mode
+
 [DatabaseService]
     ;
     ; ### Choose the DB
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index c057887..b6b1eb5 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,4 +1,4 @@
-; This is the main configuration file for standalone OpenSim instances
+; This is the main configuration file for an instance of OpenSim running in standalone mode
 
 [DatabaseService]
     ;
@@ -24,6 +24,22 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+[Modules]
+    ;; Choose one cache module and the corresponding config file, if it exists.
+    ;; Copy the config .example file into your own .ini file and alter that
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
+
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
+
+    ;AssetCaching = "CenomeMemoryAssetCache"
+    ;Include-CenomeCache = "config-include/CenomeCache.ini"
+
+    ;AssetCaching = "GlynnTuckerAssetCache"
+
+    ;; Authorization is not on by default, as it depends on external php
+    ;AuthorizationServices = "LocalAuthorizationServicesConnector"
+
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
@@ -42,22 +58,6 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
-[Modules]
-    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-    ;; Copy the config .example file into your own .ini file and change configs there
-    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
-
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
-
-    ;AssetCaching = "GlynnTuckerAssetCache"
-
-    ; AssetCaching = "CenomeMemoryAssetCache"
-    ; Include-CenomeCache = "config-include/CenomeCache.ini"
-
-    ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices = "LocalAuthorizationServicesConnector"
-
 [GridService]
     ;; For in-memory region storage (default)
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-- 
cgit v1.1


From 655aee44c4236d7023b9274645bf033b87b17131 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 22 Oct 2011 02:51:41 +0100
Subject: Rename some of the example commented out server names to
 mygridserver.com like all the others.

This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
---
 bin/config-include/GridCommon.ini.example | 44 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 72cd606..e368249 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -24,21 +24,39 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
-[AssetService]
+[Modules]
+    ;; Choose one cache module and the corresponding config file, if it exists.
+    ;; Copy the config .example file into your own .ini file and adapt that.
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
+
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
+
+    ;AssetCaching = "CenomeMemoryAssetCache"
+    ;Include-CenomeCache = "config-include/CenomeCache.ini"
 
+    ;AssetCaching = "GlynnTuckerAssetCache"
+
+    ;; Optionally, the port for the LLProxyLoginModule module can be changed
+    ;Setup_LLProxyLoginModule = "9090/"
+
+    ;; Authorization is not on by default, as it depends on external php
+    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
+
+[AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
     ;
     ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
-    AssetServerURI = "http://myassetserver.com:8003"
+    AssetServerURI = "http://mygridserver.com:8003"
 
 [InventoryService]
     ;
     ; Change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://myinventoryserver.com:8003"
+    InventoryServerURI = "http://mygridserver.com:8003"
 
 [GridService]
     ;
@@ -120,23 +138,3 @@
 
 [MapImageService]
    	MapImageServerURI = "http://mygridserver.com:8003"
-
-[Modules]
-    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-    ;; Copy the config .example file into your own .ini file and change configs there
-    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
-
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
-
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    ;Include-CenomeCache = "config-include/CenomeCache.ini"
-
-    ;AssetCaching = "GlynnTuckerAssetCache"
-
-    ;; Optionally, the port for the LLProxyLoginModule module can be changed
-
-    ;Setup_LLProxyLoginModule = "9090/"
-
-    ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
-- 
cgit v1.1


From 4f628849f36dd78a7f1608c7177760193c26d6d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Dec 2011 00:14:48 +0000
Subject: Add more documentation to EstateConnectorString in
 StandaloneCommon.ini.example

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index b6b1eb5..84611ec 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -13,7 +13,10 @@
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-    ; Uncomment this line if you are using MySQL and want to use a different database for estates
+
+    ; Uncomment this line if you are using MySQL and want to use a different database for estates.
+    ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
+    ; Most people won't need to do this so only uncomment if you know what you're doing.
     ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
     ; MSSQL
-- 
cgit v1.1


From 5d8ed077bc01b46cdd4a6854cc08c735ebb66c24 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 30 Dec 2011 19:17:35 -0800
Subject: Bring back the Hyperlinker to the Robust console. Moved the config to
 [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No
 changes in user-facing inis.

---
 bin/config-include/GridHypergrid.ini       | 2 +-
 bin/config-include/HyperSimianGrid.ini     | 2 +-
 bin/config-include/StandaloneHypergrid.ini | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4c32498..5f0ba37 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -26,7 +26,6 @@
     LandServices            = "RemoteLandServicesConnector"
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
-	HypergridLinker         = "HypergridLinker"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -60,6 +59,7 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
+	HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index ec4efc0..99a589c 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -40,7 +40,6 @@
     LibraryModule = false
     
     AssetCaching = "FlotsamAssetCache"
-	HypergridLinker         = "HypergridLinker"
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -56,6 +55,7 @@
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
+	HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f8c258a..00beb31 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -22,7 +22,6 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
-	HypergridLinker         = "HypergridLinker"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
@@ -84,6 +83,7 @@
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
   
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 	
 [PresenceService]
-- 
cgit v1.1


From 8bdd80abfa3830142b16615d97d555dad417e08d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 12 Jan 2012 09:56:35 -0800
Subject: HG: normalize all externalized user ULRs to be the Home URL, i.e. the
 location of the user's UAS. This corrects an earlier design which had some
 cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both
 the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check
 diff of the example files, but basically all vars that were pointing to
 profile should point to the UAS instead and should be called HomeURI.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e368249..815e08c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -123,7 +123,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/user"
+    HomeURI = "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.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84611ec..2f39218 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -48,13 +48,13 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 [HGInventoryService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGInventoryAccessModule]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 	Gatekeeper = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors
-- 
cgit v1.1


From 9ed9720861ef3b63b1fca75c843a509ee3239b17 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 17 Jan 2012 22:07:40 -0500
Subject: Update osGetGrid**** functions

	The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
---
 bin/config-include/GridCommon.ini.example | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 815e08c..d70c8e4 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -58,6 +58,12 @@
     ;
     InventoryServerURI = "http://mygridserver.com:8003"
 
+[GridInfo]
+   ;
+   ; Change this to your grid info service
+   ;
+   GridInfoURI = "http://mygridserver.com:8002"
+
 [GridService]
     ;
     ; Change this to your grid-wide grid server
-- 
cgit v1.1


From 088f1213b423204f6c8ae70d90e8f2bea58162c6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 28 Jan 2012 01:01:19 +0000
Subject: Remove accidental /user postfix from HomeURI in
 [HGInventoryAccessModule] in GridCommon.ini.example and from
 SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example

As per http://opensimulator.org/mantis/view.php?id=5852, confirmed by diva via aiaustin
---
 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 d70c8e4..4195bce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -129,7 +129,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "http://mygridserver.com:8002/user"
+    HomeURI = "http://mygridserver.com:8002"
     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.
-- 
cgit v1.1


From 773994723a9240b128f5054bd48e4e09b9045e63 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 7 Feb 2012 20:35:04 +0000
Subject: Add warning about only uncommenting EstateConnectionString if you
 know what you're doing to GridCommon.ini.example (was already in
 StandaloneCommon.ini.example)

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4195bce..712481d 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -14,6 +14,8 @@
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
     ; Uncomment this line if you are using MySQL and want to use a different database for estates
+    ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
+    ; Most people won't need to do this so only uncomment if you know what you're doing.
     ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
     ; MSSQL
-- 
cgit v1.1


From 33c14cb107ecb67a3e971d6adaab17d173d52747 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 10:00:11 -0700
Subject: Region access control! Region operators can now specify things like
 DisallowForeigners (means what it says) and DisallowResidents (means that
 only admins and managers can get into the region). This puts the
 never-completed AuthorizationService to good use. Note that I didn't
 implement a grid-wide Authorization service; this service implementation is
 done entirely locally on the simulator. This can be changed as usual by
 pluging in a different AuthorizationServicesConnector.

---
 bin/config-include/Grid.ini                     |  1 +
 bin/config-include/GridCommon.ini.example       | 10 ++++++++++
 bin/config-include/GridHypergrid.ini            |  1 +
 bin/config-include/Standalone.ini               |  4 +---
 bin/config-include/StandaloneCommon.ini.example | 10 ++++++++++
 bin/config-include/StandaloneHypergrid.ini      |  4 +---
 6 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index da860c6..95d6264 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,6 +14,7 @@
     AvatarServices			= "RemoteAvatarServicesConnector"
     NeighbourServices		= "RemoteNeighbourServicesConnector"
     AuthenticationServices	= "RemoteAuthenticationServicesConnector"
+    AuthorizationServices	= "LocalAuthorizationServicesConnector"
     PresenceServices		= "RemotePresenceServicesConnector"
     UserAccountServices		= "RemoteUserAccountServicesConnector"
     GridUserServices		= "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 712481d..fa6f525 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -146,3 +146,13 @@
 
 [MapImageService]
    	MapImageServerURI = "http://mygridserver.com:8003"
+
+[AuthorizationService]
+	; If you have regions with access restrictions
+	; specify them here using the convention
+	; Region_<Region_Name> = <flags>
+	; Valid flags are:
+	; DisallowForeigners -- HG visitors not allowed
+	; DisallowResidents -- only Admins and Managers allowed
+	; Example:
+	; Region_Test_1 = "DisallowForeigners"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5f0ba37..da447f1 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,6 +17,7 @@
     AvatarServices			= "RemoteAvatarServicesConnector"
     NeighbourServices		= "RemoteNeighbourServicesConnector"
     AuthenticationServices	= "RemoteAuthenticationServicesConnector"
+    AuthorizationServices	= "LocalAuthorizationServicesConnector"
     PresenceServices		= "RemotePresenceServicesConnector"
     UserAccountServices		= "RemoteUserAccountServicesConnector"
     GridUserServices		= "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6ad4ac9..d307387 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,6 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices	= "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
@@ -47,9 +48,6 @@
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2f39218..2a7e49e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -231,3 +231,13 @@
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
+
+[AuthorizationService]
+	; If you have regions with access restrictions
+	; specify them here using the convention
+	; Region_<Region_Name> = <flags>
+	; Valid flags are:
+	; DisallowForeigners -- HG visitors not allowed
+	; DisallowResidents -- only Admins and Managers allowed
+	; Example:
+	; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 00beb31..286d0a1 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,6 +12,7 @@
     InventoryServices		= "HGInventoryBroker"
     NeighbourServices		= "LocalNeighbourServicesConnector"
     AuthenticationServices	= "LocalAuthenticationServicesConnector"
+    AuthorizationServices	= "LocalAuthorizationServicesConnector"
     GridServices			= "LocalGridServicesConnector"
     PresenceServices		= "LocalPresenceServicesConnector"
     UserAccountServices		= "LocalUserAccountServicesConnector"
@@ -68,9 +69,6 @@
 	LibraryName = "OpenSim Library"
 	DefaultLibrary = "./inventory/Libraries.xml"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
-- 
cgit v1.1


From 92b1ade78ea51ca1499298476fe7cc7ce4e955cc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 15:01:10 -0700
Subject: BAD JUSTIN! People using standalone in master, please update your
 StandaloneCommon.ini according to this change. People using robust in master,
 please update your Robust.HG.ini.example[.HG].ini according to this change.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2a7e49e..4c734a1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,6 +44,7 @@
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
+    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-- 
cgit v1.1


From 7dfa0309c63263fb15dc9e3883f5717f28e21c0c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 15:36:20 -0700
Subject: More on HG access control. This commit splits the
 UserManagementModule into the Basic one and the HG one, so that we can do
 everything that needs to be done for HG ACLs to work without interfering with
 the vanilla opensim. For the moment, it finds foreign users who have left a
 trace in the region, e.g. an object. This makes it possible to ban/IM/etc
 these users using the regular avatar picker. TODO: contact the UAS directly
 given a name of the form First.Last @foo.com.

---
 bin/config-include/GridHypergrid.ini       | 1 +
 bin/config-include/StandaloneHypergrid.ini | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index da447f1..31a4059 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -27,6 +27,7 @@
     LandServices            = "RemoteLandServicesConnector"
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
+	UserManagementModule	= "HGUserManagementModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 286d0a1..ee51067 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -23,6 +23,7 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
+	UserManagementModule	= "HGUserManagementModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
-- 
cgit v1.1


From ab54ce1907e26935bfb847742d4f5aa95d34aca0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Mar 2012 00:18:04 +0000
Subject: Fix configuration problems where XAssetDatabasePlugin was picked up
 accidentally.

The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade.  There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files.
This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places).
Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
---
 bin/config-include/StandaloneCommon.ini.example | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4c734a1..3dfbed7 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,7 +44,6 @@
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
-    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
@@ -241,4 +240,4 @@
 	; DisallowForeigners -- HG visitors not allowed
 	; DisallowResidents -- only Admins and Managers allowed
 	; Example:
-	; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
+	; Region_Test_1 = "DisallowForeigners"
-- 
cgit v1.1


From d08ad6459a03a6a5a6a551fd2b275f1c7da94d8e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 20 Mar 2012 17:14:19 -0700
Subject: HG Friends: allow the establishment of HG friendships without
 requiring co-presence in the same sim. Using avatar picker, users can now
 search for names such as "first.last@grid.com:9000", find them, and request
 friendship. Friendship requests are stored if target user is offline. TESTED
 ON STANDALONE ONLY.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ee51067..75c4788 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -159,8 +159,12 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-	LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
+	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+	GridService = "OpenSim.Services.GridService.dll:GridService"
+	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-- 
cgit v1.1


From 7223b63563f28f6fe8044bdabcd1b9900d28c54a Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer
Date: Tue, 27 Mar 2012 22:09:58 +0200
Subject: User level based restrictions for HyperGrid teleports, asset uploads,
 group creations and getting contacted from other grids. Incoming HyperGrid
 teleports can also be restricted to local users.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 3dfbed7..8d9842c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -147,6 +147,9 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ;; Are foreign visitors allowed
+    ;ForeignAgentsAllowed = true
+
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
     ;;
@@ -241,3 +244,7 @@
 	; DisallowResidents -- only Admins and Managers allowed
 	; Example:
 	; Region_Test_1 = "DisallowForeigners"
+
+[UserAgentService]
+    ; User level required to be contacted from other grids
+    ;LevelOutsideContacts = 0
-- 
cgit v1.1


From 7c534e558ddedc66be21efa72bfa9aa7087e6f8c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 7 Apr 2012 14:38:32 -0700
Subject: Added gatekeeper and uas addresses to grid info, so that viewers can
 take advantage of that info.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8d9842c..4f4f400 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -231,6 +231,14 @@
     ; currently unused
     ;password = http://127.0.0.1/password
 
+	; HG address of the gatekeeper, if you have one
+	; this is the entry point for all the regions of the world
+	; gatekeeper = http://127.0.0.1:9000/
+
+	; HG user domain, if you have one
+	; this is the entry point for all user-related HG services
+	; uas = http://127.0.0.1:9000/
+
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From fb44e7b636f35a773c016dcfbd56318d6d337c57 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 10 Apr 2012 17:46:34 +0100
Subject: minor: convert tabs to spaces in config example files from recent
 7c534e5

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4f4f400..8fe64df 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -231,13 +231,13 @@
     ; currently unused
     ;password = http://127.0.0.1/password
 
-	; HG address of the gatekeeper, if you have one
-	; this is the entry point for all the regions of the world
-	; gatekeeper = http://127.0.0.1:9000/
+    ; HG address of the gatekeeper, if you have one
+    ; this is the entry point for all the regions of the world
+    ; gatekeeper = http://127.0.0.1:9000/
 
-	; HG user domain, if you have one
-	; this is the entry point for all user-related HG services
-	; uas = http://127.0.0.1:9000/
+    ; HG user domain, if you have one
+    ; this is the entry point for all user-related HG services
+    ; uas = http://127.0.0.1:9000/
 
 [MapImageService]
 	; Set this if you want to change the default
-- 
cgit v1.1


From 1f4d3d35822c5ad3dbdd5f363014f1bf9afebdc6 Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer
Date: Wed, 11 Apr 2012 18:52:07 +0200
Subject: HGFriendsModule: Added optional user level based restriction to send
 friendship invitations to foreign users.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fa6f525..8d7f6fc 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,10 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    ;LevelHGFriends = 0;
+
 [UserAgentService]
     ;
     ; === HG ONLY ===
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8fe64df..e4bc548 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -61,6 +61,10 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    ;LevelHGFriends = 0;
+
 [GridService]
     ;; For in-memory region storage (default)
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-- 
cgit v1.1


From 30d8506bc2f04028c1bbdcf57cf5f45fedb3ae7a Mon Sep 17 00:00:00 2001
From: nebadon
Date: Thu, 12 Apr 2012 18:27:14 -0700
Subject: make changes to FlotsamCache.ini.example as noted in mantis #5960
 http://opensimulator.org/mantis/view.php?id=5960

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index cd39f8c..b9c6d84 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -36,7 +36,7 @@
 
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
-    FileCleanupTimer = .166  ;roughly every 10 minutes
+    FileCleanupTimer = 1.0  ;every hour
 
     ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
     ; long (in miliseconds) to block a request thread while trying to complete
@@ -60,4 +60,4 @@
     ; cache, and request all assets that are found that are not already cached (this
     ; will cause those assets to be cached)
     ;
-    ; DeepScanBeforePurge = false
+    DeepScanBeforePurge = true
-- 
cgit v1.1


From cccef2e56dc8b02ccd83fb1c832e4ce026cdcaf9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 May 2012 19:21:43 +0100
Subject: Calculate the Daylight Savings Time information sent to the viewer
 based on US Pacific Standard Time rather than whatever timezone the login
 server is set to.

This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time.
However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation.
This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST.
If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local".
A mailing list announcement will be made later.
Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch.
From http://opensimulator.org/mantis/view.php?id=5972
---
 bin/config-include/Standalone.ini | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d307387..74d9d2e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -95,6 +95,18 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
+    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
+    ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
+    ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
+    ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
+    ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
+    ;; Options are 
+    ;;   "none"     no DST 
+    ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
+    ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
+    ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
+    DSTZone = "America/Los_Angeles;Pacific Standard Time"
+
 [MapImageService]
 	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; in minutes
-- 
cgit v1.1


From 9707a2d57c4a4a8e818e0e9b0ec57c5b7abcb70c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jun 2012 18:24:02 +0100
Subject: Remove profile from basic configuration

---
 bin/config-include/Grid.ini       | 3 ---
 bin/config-include/Standalone.ini | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 95d6264..cb3a5c8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -29,9 +29,6 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
-[Profile]
-    Module = "BasicProfileModule"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 74d9d2e..ba72fe7 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,9 +25,6 @@
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
-[Profile]
-    Module = "BasicProfileModule"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
-- 
cgit v1.1


From a533db7e279d533a6858a194fef5d913553c1bf9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 23 Aug 2012 22:30:14 +0100
Subject: Add an [HGAssetService] section to SQLiteStandalone.ini with the same
 connection string as [AssetService].

This is necessary because commit 8131a24 (Tue Mar 27 10:08:13 2012) started passing the config section name rather than hardcoding "AssetService"
This meant that the HG external-facing asset service tried to read ConnectionString from [HGAssetService] rather than [AssetService].
On SQLite, not finding this meant that it fell back to [DatabaseService], which is set for OpenSim.db rather than Asset.db.
Therefore, all external asset requests returned null.
Solution taken here is to create an [HGAssetService] section with the same ConnectionString as [AssetService].
This bug does not affect normal MySQL/MSSQL config since they use the [DatabaseService] connection string anyway.
Addresses http://opensimulator.org/mantis/view.php?id=6200, many thanks to DanBanner for identifying the exact problem commit which was very helpful.
This was a regression from OpenSimulator 0.7.3.1 which did not contain this bug.
---
 bin/config-include/storage/SQLiteStandalone.ini | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index c1de71a..67d98ff 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -7,6 +7,16 @@
 [AssetService]
     ConnectionString = "URI=file:Asset.db,version=3"
 
+; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
+; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
+; However, the internal asset service will still use the [AssetService] section.
+; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService] 
+; so that they both access the same database.
+; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
+; do not have separate connection strings for different services.
+[HGAssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below
-- 
cgit v1.1


From 9f914327c6059e7ea63c0af64cc82b9049790d04 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 6 Sep 2012 12:42:14 -0700
Subject: Added missing configs, and deleted the [Profile] part on the
 Hypergrind config.

---
 bin/config-include/StandaloneHypergrid.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 75c4788..cc6c587 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -36,8 +36,6 @@
     SimulationServiceInConnector		= true
 	MapImageServiceInConnector			= true
 
-[Profile]
-    Module = "BasicProfileModule"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
@@ -97,6 +95,10 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
-- 
cgit v1.1


From d5c8c6bc12d434bb6a4bbc6f326a4ae784c12861 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Sep 2012 01:08:15 +0100
Subject: For FlotsamAssetCache, always update access times of cached scene
 assets before looking for files to expire.

This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem.  This previously had a default of true.
---
 bin/config-include/FlotsamCache.ini.example | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index b9c6d84..ad74fc1 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -54,10 +54,3 @@
 
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
-
-    ; Perform a deep scan of all assets within all regions, looking for all assets
-    ; present or referenced.  Mark all assets found that are already present in the
-    ; cache, and request all assets that are found that are not already cached (this
-    ; will cause those assets to be cached)
-    ;
-    DeepScanBeforePurge = true
-- 
cgit v1.1


From de69a24574786f7517e8dc3be62e413f9e0fae22 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 15 Sep 2012 19:33:51 -0700
Subject: More on HG2.0: added the possibility of controlling the appearance
 that avies use to visit other grids. Not as good as I wanted, but good
 enough. Unfortunately we can't switch the appearance from under the avie
 without getting into a lot of weirdnesses because appearance is
 viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP
 unless the user is wearing an allowed HG appearance -- the user gets a
 warning and needs to switch appearance. WARNING: I'm still not committing the
 config vars because this is still not ready for ppl to test.

---
 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 cc6c587..b0ae351 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -153,6 +153,7 @@
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 ;; The interface that local users get when they are in other grids
 ;; This restricts/filters the asset operations from the outside
-- 
cgit v1.1


From 3089b6d824f1d4eb25ba12c5fd037153fdc92e1e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 20 Sep 2012 15:49:22 -0700
Subject: More HG2.0: Added permission policies in HGAsset Service based on
 asset types. The policies are given in the config. This is only half of the
 story. The other half, pertaining to exports/imports made by the sim, will be
 done next.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index e4bc548..d8ecba8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -53,6 +53,17 @@
 [HGAssetService]
     HomeURI = "http://127.0.0.1:9000"
 
+    ;; The asset types that other grids can get from / post to this service.
+	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+	;;
+	;; Leave blank or commented if you don't want to apply any restrictions.
+	;; A more strict, but still reasonable, policy may be to disallow the exchange 
+	;; of scripts, like so:
+    ; DisallowGET ="LSLText"
+    ; DisallowPOST ="LSLBytecode"
+
+
 [HGInventoryAccessModule]
     HomeURI = "http://127.0.0.1:9000"
 	Gatekeeper = "http://127.0.0.1:9000"
-- 
cgit v1.1


From e379566e6e3bed0d7001f099a5ea8dfd648d76cf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 20 Sep 2012 19:50:57 -0700
Subject: Improvement over last commit: refactor the asset permissions code, so
 that it can be used by both the HG Asset Service and the simulator. Also
 renamed the config vars to something more intuitive

---
 bin/config-include/StandaloneCommon.ini.example | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d8ecba8..d5eb50d 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -53,15 +53,17 @@
 [HGAssetService]
     HomeURI = "http://127.0.0.1:9000"
 
-    ;; The asset types that other grids can get from / post to this service.
+    ;; The asset types that this service can export to / import from other grids.
+	;; Comma separated.
 	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
 	;;
 	;; Leave blank or commented if you don't want to apply any restrictions.
 	;; A more strict, but still reasonable, policy may be to disallow the exchange 
 	;; of scripts, like so:
-    ; DisallowGET ="LSLText"
-    ; DisallowPOST ="LSLBytecode"
+    ; DisallowExport ="LSLText"
+    ; DisallowImport ="LSLBytecode"
 
 
 [HGInventoryAccessModule]
-- 
cgit v1.1


From b542622b3a841e73f071aab563ba1e211c5a87e3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 21 Sep 2012 07:44:18 -0700
Subject: HG 2.0: added asset import/export policies at the sim too.

---
 bin/config-include/GridCommon.ini.example       | 20 ++++++++++++++++++++
 bin/config-include/StandaloneCommon.ini.example |  2 +-
 2 files changed, 21 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 8d7f6fc..79f7ed6 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,26 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+[HGAssetService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your server 
+    ; accessible from other grids
+    ;
+    HomeURI = "http://mygridserver.com:8002"
+
+    ;; The asset types that this grid can export to / import from other grids.
+	;; Comma separated.
+	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+	;;
+	;; Leave blank or commented if you don't want to apply any restrictions.
+	;; A more strict, but still reasonable, policy may be to disallow the exchange 
+	;; of scripts, like so:
+    ; DisallowExport ="LSLText"
+    ; DisallowImport ="LSLBytecode"
+
 [HGFriendsModule]
     ; User level required to be able to send friendship invitations to foreign users
     ;LevelHGFriends = 0;
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d5eb50d..048710a 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -53,7 +53,7 @@
 [HGAssetService]
     HomeURI = "http://127.0.0.1:9000"
 
-    ;; The asset types that this service can export to / import from other grids.
+    ;; The asset types that this grid can export to / import from other grids.
 	;; Comma separated.
 	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
 	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-- 
cgit v1.1


From 48f4b32d7f23c2d7a52db355017c8b2bb57b55fa Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 21 Sep 2012 21:03:14 -0700
Subject: More HG 2.0: access control at the Gatekeeper. \o/

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 048710a..4339cb1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -164,8 +164,17 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
-    ;; Are foreign visitors allowed
+    ;; Are foreign visitors allowed?
     ;ForeignAgentsAllowed = true
+    ;;
+    ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
+    ;; Leave blank or commented for no exceptions.
+    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
+    ;;
+    ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
+    ;; Leave blank or commented for no exceptions.
+    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
+
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
-- 
cgit v1.1


From fb6d6e5cca8e283025ef80cfd29a97bc5882550d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Sep 2012 11:11:48 -0700
Subject: HG 2.0: User Agent Service now can also control where the local users
 can go. Domain-name and user-level based. \o/

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4339cb1..84de0ec 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -280,5 +280,22 @@
 	; Region_Test_1 = "DisallowForeigners"
 
 [UserAgentService]
-    ; User level required to be contacted from other grids
+    ;; User level required to be contacted from other grids
     ;LevelOutsideContacts = 0
+
+    ;; Restrictions on destinations of local users.
+    ;; Are local users allowed to visit other grids?
+    ;; What user level? Use variables of this forrm:
+    ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
+	;; (the default is true)
+    ;; For example:
+    ; ForeignTripsAllowed_Level_0 = false
+    ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
+    ;;
+    ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
+    ;; Leave blank or commented for no exceptions.
+    ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
+	;;
+    ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
+    ;; Leave blank or commented for no exceptions.
+    ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
-- 
cgit v1.1


From 3c77b8f463a852aecf3cb29fe4e5f4614f474dbf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 26 Sep 2012 12:40:41 -0700
Subject: Use GridUser properly for foreign users.

---
 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 b0ae351..76d588c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -130,6 +130,7 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-- 
cgit v1.1


From 7412795a0bedae060e9f2bce2fa12e0497916f6e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 2 Nov 2012 08:05:56 -0700
Subject: HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS
 AGAINST THESE.

---
 bin/config-include/StandaloneCommon.ini.example | 162 ++++++++++++++----------
 bin/config-include/StandaloneHypergrid.ini      |   8 +-
 2 files changed, 99 insertions(+), 71 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84de0ec..f28de43 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,36 +47,6 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-[HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
-
-[HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
-
-    ;; The asset types that this grid can export to / import from other grids.
-	;; Comma separated.
-	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-	;;
-	;; Leave blank or commented if you don't want to apply any restrictions.
-	;; A more strict, but still reasonable, policy may be to disallow the exchange 
-	;; of scripts, like so:
-    ; DisallowExport ="LSLText"
-    ; DisallowImport ="LSLBytecode"
-
-
-[HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-	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.
-    ; OutboundPermission = False
-
-[HGFriendsModule]
-    ; User level required to be able to send friendship invitations to foreign users
-    ;LevelHGFriends = 0;
 
 [GridService]
     ;; For in-memory region storage (default)
@@ -97,11 +67,6 @@
     ;; 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"
@@ -140,41 +105,6 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
-[GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
-
-    ; Does this grid allow incoming links to any region in it?
-    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
-    AllowTeleportsToAnyRegion = true
-
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
-    ;AllowedClients = ""
-    ;DeniedClients = ""
-
-    ;; Are foreign visitors allowed?
-    ;ForeignAgentsAllowed = true
-    ;;
-    ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
-    ;; Leave blank or commented for no exceptions.
-    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
-    ;;
-    ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
-    ;; Leave blank or commented for no exceptions.
-    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
-
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
@@ -279,6 +209,44 @@
 	; Example:
 	; Region_Test_1 = "DisallowForeigners"
 
+;;
+;; HG configurations
+;;
+[GatekeeperService]
+    ExternalName = "http://127.0.0.1:9000"
+
+    ; Does this grid allow incoming links to any region in it?
+    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+    AllowTeleportsToAnyRegion = true
+
+	;; Regular expressions for controlling which client versions are accepted/denied.
+	;; An empty string means nothing is checked.
+	;;
+	;; Example 1: allow only these 3 types of clients (any version of them)
+	;; AllowedClients = "Imprudence|Hippo|Second Life"
+	;;
+	;; Example 2: allow all clients except these
+	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+	;;
+	;; Note that these are regular expressions, so every character counts.
+	;; Also note that this is very weak security and should not be trusted as a reliable means
+	;; for keeping bad clients out; modified clients can fake their identifiers.
+	;;
+	;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
+    ;; Are foreign visitors allowed?
+    ;ForeignAgentsAllowed = true
+    ;;
+    ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
+    ;; Leave blank or commented for no exceptions.
+    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
+    ;;
+    ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
+    ;; Leave blank or commented for no exceptions.
+    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
+
 [UserAgentService]
     ;; User level required to be contacted from other grids
     ;LevelOutsideContacts = 0
@@ -299,3 +267,57 @@
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
+
+[HGInventoryService]
+    HomeURI = "http://127.0.0.1:9000"
+
+[HGAssetService]
+    HomeURI = "http://127.0.0.1:9000"
+
+    ;; The asset types that this grid can export to / import from other grids.
+	;; Comma separated.
+	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+	;;
+	;; Leave blank or commented if you don't want to apply any restrictions.
+	;; A more strict, but still reasonable, policy may be to disallow the exchange 
+	;; of scripts, like so:
+    ; DisallowExport ="LSLText"
+    ; DisallowImport ="LSLBytecode"
+
+
+[HGInventoryAccessModule]
+    HomeURI = "http://127.0.0.1:9000"
+	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.
+	;; true = allow exports, false = disallow exports. True by default.
+    ; OutboundPermission = True
+
+	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+	;; and available when they return. True by default.
+	;RestrictInventoryAccessAbroad = True
+
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    ;LevelHGFriends = 0;
+
+[Messaging]
+    ; === HG ONLY ===
+    ;; change this to the address of your simulator
+    Gatekeeper = "http://127.0.0.1:9000"
+
+
+[EntityTransfer]
+	;; User level from which local users are allowed to HG teleport. Default 0 (all users)
+	;LevelHGTeleport = 0
+
+	;; Are local users restricted from taking their appearance abroad?
+	;; Default is no restrictions
+    ;RestrictAppearanceAbroad = false
+
+	;; If appearance is restricted, which accounts' appearances are allowed to be exported?
+	;; Comma-separated list of account names
+    AccountForAppearance = "Test User, Astronaut Smith"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 76d588c..195e780 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -152,7 +152,13 @@
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
     ; For the InventoryServiceInConnector
-    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+	;; alternatives:
+	;;  HG1.5, more permissive, not recommended, but still supported
+    ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+	;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
+
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-- 
cgit v1.1


From 16d18afe21fdafe19f2f0be9803834626f4c20b7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 Dec 2012 12:38:19 -0800
Subject: Added missing config var in grided sims.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 79f7ed6..e53fcca 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,11 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+	;; and available when they return. True by default.
+	;RestrictInventoryAccessAbroad = True
+
+
 [HGAssetService]
     ;
     ; === HG ONLY ===
-- 
cgit v1.1


From db2b3627f2e22f6e677dc77cd0225c3937fff1b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 20 Feb 2013 00:48:02 +0000
Subject: Add information about MinLoginLevel to example ini files

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f28de43..ffa2d49 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,6 +85,11 @@
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
 
+    ; The minimum user level required for a user to be able to login.  0 by default
+    ; If you disable a particular user's account then you can set their login level below this number.
+    ; You can also change this level from the console though these changes will not be persisted.
+    ; MinLoginLevel = 0
+
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
-- 
cgit v1.1


From e515cdddec435e97e9ed4722de08ee410e94a7e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 21 Feb 2013 17:26:19 -0800
Subject: Simplification of HG configs: HomeURI and GatekeeperURI now are
 defined as default under [Startup]. They can then be overwritten in the other
 sections (but probably shouldn't). I kept the existing code for backwards
 compatibility, so this should not cause any breaks from people's current
 configurations. But people should move to have these 2 vars under [Startup]
 -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now
 end with "URI" for consistency.

---
 bin/config-include/StandaloneCommon.ini.example | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ffa2d49..3129078 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -64,8 +64,8 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper="http://127.0.0.1:9000"
+	;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -73,7 +73,8 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-    GatekeeperURI = "http://127.0.0.1:9000"
+	;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
     SRV_InventoryServerURI = "http://127.0.0.1:9000"
@@ -218,7 +219,8 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
+	;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:9000"
 
     ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
@@ -274,10 +276,12 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
+	;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
+	;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
 	;; Comma separated.
@@ -293,8 +297,9 @@
 
 
 [HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-	Gatekeeper = "http://127.0.0.1:9000"
+	;; If you have these set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
+	; GatekeeperURI = "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.
@@ -311,8 +316,8 @@
 
 [Messaging]
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper = "http://127.0.0.1:9000"
+	;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]
-- 
cgit v1.1


From f1010d7b152b68e2961b40482006221e28e976af Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 27 Feb 2013 20:49:41 -0800
Subject: Moved the HG default variables out of [Startup] and into their own
 section [Hypergrid] in *Common.ini.example. Backwards compatible for now.

---
 bin/config-include/GridCommon.ini.example       | 20 ++++++++++++++++++++
 bin/config-include/StandaloneCommon.ini.example | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e53fcca..d12ea5b 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,6 +26,26 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+[Hypergrid]
+	; Uncomment the variables in this section only if you are in
+	; Hypergrid configuration. Otherwise, ignore.
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+	;; If this is a standalone world, this is the address of this instance.
+	;; If this is a grided simulator, this is the address of the external robust server that
+	;; runs the UserAgentsService.
+	;; For example http://myworld.com:9000 or http://myworld.com:8002
+	;; This is a default that can be overwritten in some sections.
+	; HomeURI = "http://127.0.0.1:9000"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+	;; If this is a standalone world, this is the address of this instance.
+	;; If this is a grided simulator, this is the address of the external robust server
+	;; that runs the Gatekeeper service.
+	;; For example http://myworld.com:9000 or http://myworld.com:8002
+	;; This is a default that can be overwritten in some sections.
+	; GatekeeperURI = "http://127.0.0.1:9000"
+
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and adapt that.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 3129078..f80044e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -27,6 +27,27 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+[Hypergrid]
+	; Uncomment the variables in this section only if you are in
+	; Hypergrid configuration. Otherwise, ignore.
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+	;; If this is a standalone world, this is the address of this instance.
+	;; If this is a grided simulator, this is the address of the external robust server that
+	;; runs the UserAgentsService.
+	;; For example http://myworld.com:9000 or http://myworld.com:8002
+	;; This is a default that can be overwritten in some sections.
+	; HomeURI = "http://127.0.0.1:9000"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+	;; If this is a standalone world, this is the address of this instance.
+	;; If this is a grided simulator, this is the address of the external robust server
+	;; that runs the Gatekeeper service.
+	;; For example http://myworld.com:9000 or http://myworld.com:8002
+	;; This is a default that can be overwritten in some sections.
+	; GatekeeperURI = "http://127.0.0.1:9000"
+
+
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and alter that
-- 
cgit v1.1


From 6ddc39a676916009e60d38ab24e7353b9646994e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Apr 2013 16:56:18 -0700
Subject: Clean up unused config and config comments.

---
 bin/config-include/StandaloneCommon.ini.example | 14 +++++++-------
 bin/config-include/StandaloneHypergrid.ini      |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f80044e..2547244 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,7 +85,7 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-	;; If you have this set under [Startup], no need to set it here, leave it commented
+	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
@@ -94,7 +94,7 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-	;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+	;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
@@ -240,7 +240,7 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-	;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+	;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "http://127.0.0.1:9000"
 
     ; Does this grid allow incoming links to any region in it?
@@ -297,11 +297,11 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-	;; If you have this set under [Startup], no need to set it here, leave it commented
+	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-	;; If you have this set under [Startup], no need to set it here, leave it commented
+	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
@@ -318,7 +318,7 @@
 
 
 [HGInventoryAccessModule]
-	;; If you have these set under [Startup], no need to set it here, leave it commented
+	;; If you have these set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 	; GatekeeperURI = "http://127.0.0.1:9000"
 
@@ -337,7 +337,7 @@
 
 [Messaging]
     ; === HG ONLY ===
-	;; If you have this set under [Startup], no need to set it here, leave it commented
+	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 195e780..ba92030 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -55,8 +55,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -147,6 +145,9 @@
     FriendsService	= "OpenSim.Services.FriendsService.dll:FriendsService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
+
 	
 ;; 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 328883700a15e4216bf7b251ac099d38f413375e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 13 May 2013 22:11:28 -0400
Subject: UserProfiles

  UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
---
 bin/config-include/StandaloneCommon.ini.example | 16 ++++++++++++++++
 bin/config-include/StandaloneHypergrid.ini      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2547244..8c23c41 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -352,3 +352,19 @@
 	;; If appearance is restricted, which accounts' appearances are allowed to be exported?
 	;; Comma-separated list of account names
     AccountForAppearance = "Test User, Astronaut Smith"
+
+;; UserProfiles Service
+;;
+;; To use, set Enabled to true then configure for your site...
+[UserProfilesService]
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    Enabled = false
+
+    ;; Configure this for separate databse
+    ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; Realm = UserProfiles
+
+    UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+
+
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ba92030..39c33e8 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,6 +19,7 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices		= "RemoteSimulationConnectorModule"
     AvatarServices			= "LocalAvatarServicesConnector"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
 	MapImageService			= "MapImageServiceModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
@@ -184,7 +185,6 @@
 	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
 	InGatekeeper = True
 
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-- 
cgit v1.1


From 90097de6c3cf58989698b37c89baa8268895fc86 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 11 Jun 2013 20:35:25 -0400
Subject: Add option to set minimum fee for classified ads

  Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting
  the minimum price for publishing a classified ad.

  http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
---
 bin/config-include/StandaloneCommon.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..8ec3daf 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -222,6 +222,9 @@
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:9000/
 
+    ;; Minimum fee to publish classified add
+    ;  ClassifiedFee = 0
+
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From 9fec0faade3979fc6e514b4acde92741aa0e9c16 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 11 Jun 2013 21:46:40 -0400
Subject: Revert "Add option to set minimum fee for classified ads"

This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86.
---
 bin/config-include/StandaloneCommon.ini.example | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8ec3daf..8c23c41 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -222,9 +222,6 @@
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:9000/
 
-    ;; Minimum fee to publish classified add
-    ;  ClassifiedFee = 0
-
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 13 Jun 2013 09:18:27 -0400
Subject: Add Option: ClassifiedFee

  Add option to set minimum fee for publishing classifieds. Many viewers have a
  hard coded minimum of 50, which makes publishing classifieds fail where grids
  have no economy. This allows the grid to set the minimum fee to a suitable
  value for their operation.

  The option is located in the [LoginService] section and defaults to 0. The
  value is sent as "classified_fee" in the login response.
---
 bin/config-include/StandaloneCommon.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..6b991a8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -115,6 +115,9 @@
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Set minimum fee to publish classified
+    ; ClassifiedFee = 0
+
     ;; Regular expressions for controlling which client versions are accepted/denied.
     ;; An empty string means nothing is checked.
     ;;
-- 
cgit v1.1


From 7b0b5c9d97dea840e1ede6e2318b3c049c804983 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 13:49:58 -0700
Subject: Added BasicSearchModule.cs which handles OnDirFindQuery events.
 Removed that handler from both Groups modules in core, and replaced them with
 an operation on IGroupsModule.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..15ba55a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -23,6 +23,7 @@
     InventoryAccessModule	= "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
 	MapImageService			= "MapImageServiceModule"
+	SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..7edcafb 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -28,6 +28,7 @@
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
 	UserManagementModule	= "HGUserManagementModule"
+	SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ba72fe7..d3b9cb4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,6 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService			= "MapImageServiceModule"
+	SearchModule			= "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 39c33e8..3abf49b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -25,6 +25,7 @@
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
 	UserManagementModule	= "HGUserManagementModule"
+	SearchModule			= "BasicSearchModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
-- 
cgit v1.1


From d82126b651d07893c701c8477630aabf022b30d0 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 31 Jul 2013 11:42:22 -0700
Subject: Add the Simian service config to the GridCommon example

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d12ea5b..920a691 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -205,3 +205,12 @@
 	; DisallowResidents -- only Admins and Managers allowed
 	; Example:
 	; Region_Test_1 = "DisallowForeigners"
+
+
+;; Uncomment if you are using SimianGrid for grid services
+[SimianGrid]
+        ;; SimianGrid services URL
+        ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
+
+        ;; Capability assigned by the grid administrator for the simulator
+        ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
\ No newline at end of file
-- 
cgit v1.1


From 54b1071556edf264835f990bb3595064d2b2e2f0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 23:12:54 +0100
Subject: Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to
 be manually forced in a new [SimulationService] config setting.

This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default.  If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
---
 bin/config-include/Grid.ini       | 11 +++++++++++
 bin/config-include/Standalone.ini | 11 +++++++++++
 2 files changed, 22 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 15ba55a..1837bdd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -30,6 +30,17 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d3b9cb4..7b7beb2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -26,6 +26,17 @@
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
-- 
cgit v1.1


From b858be345a03448cf653efc725ec1fd4a57775f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 5 Sep 2013 00:41:03 +0100
Subject: minor: add doc about DefaultHGRegion and some of the other
 GridService region settings (though not all as of yet)

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 6b991a8..f7545d4 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -81,11 +81,27 @@
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;;  
+    ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
+    ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
+    ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
+    ;;                  an explicit region.
+    ;;  
+    ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
+    ;;                  region will be used.
+    ;;  
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
+    ;;  
+    ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
+    ;;  
+    ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
+    ;;
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
@@ -94,7 +110,7 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-	;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
-- 
cgit v1.1


From ac0a527976cda9d138d1b8967e81be4767e9f332 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:27:37 +0100
Subject: Add [SimulationService] section to GridHypergrid.ini and
 StandaloneHypergrid.ini

This was already in Grid.ini and Standalone.ini
Default settings are same as previously, just introduce a debug ConnectorProtocolVersion parameter
---
 bin/config-include/GridHypergrid.ini       | 11 +++++++++++
 bin/config-include/StandaloneHypergrid.ini | 10 ++++++++++
 2 files changed, 21 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 7edcafb..d416ee9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -35,6 +35,17 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [Profile]
     Module = "BasicProfileModule"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 3abf49b..4dd35c0 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -38,6 +38,16 @@
     SimulationServiceInConnector		= true
 	MapImageServiceInConnector			= true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
-- 
cgit v1.1


From 997700c4aae2c0498e86c955cd158e89ae2d2489 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:49:27 +0100
Subject: minor: Make config-include .ini files more consistent

Chiefly tabs to spaces.
No actual setting changes
---
 bin/config-include/Grid.ini                     |   7 +-
 bin/config-include/GridCommon.ini.example       |  83 +++++++++---------
 bin/config-include/GridHypergrid.ini            |  25 +++---
 bin/config-include/HyperSimianGrid.ini          |   7 +-
 bin/config-include/Standalone.ini               |   9 +-
 bin/config-include/StandaloneCommon.ini.example | 109 ++++++++++++------------
 bin/config-include/StandaloneHypergrid.ini      |  58 ++++++-------
 7 files changed, 149 insertions(+), 149 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 1837bdd..69a209a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -22,8 +22,8 @@
     EntityTransferModule	= "BasicEntityTransferModule"
     InventoryAccessModule	= "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	MapImageService			= "MapImageServiceModule"
-	SearchModule			= "BasicSearchModule"
+    MapImageService			= "MapImageServiceModule"
+    SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -52,7 +52,7 @@
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-	NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -64,5 +64,6 @@
 
 [MapImageService]
 	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
 	; in minutes
 	RefreshTime = 60
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 920a691..0a69dbf 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -27,24 +27,24 @@
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
 [Hypergrid]
-	; Uncomment the variables in this section only if you are in
-	; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server that
-	;; runs the UserAgentsService.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server
-	;; that runs the Gatekeeper service.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; GatekeeperURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -81,10 +81,10 @@
     InventoryServerURI = "http://mygridserver.com:8003"
 
 [GridInfo]
-   ;
-   ; Change this to your grid info service
-   ;
-   GridInfoURI = "http://mygridserver.com:8002"
+    ;
+    ; Change this to your grid info service
+    ;
+    GridInfoURI = "http://mygridserver.com:8002"
 
 [GridService]
     ;
@@ -157,9 +157,9 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
-	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-	;; and available when they return. True by default.
-	;RestrictInventoryAccessAbroad = True
+    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+    ;; and available when they return. True by default.
+    ;RestrictInventoryAccessAbroad = True
 
 
 [HGAssetService]
@@ -171,14 +171,14 @@
     HomeURI = "http://mygridserver.com:8002"
 
     ;; The asset types that this grid can export to / import from other grids.
-	;; Comma separated.
-	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-	;;
-	;; Leave blank or commented if you don't want to apply any restrictions.
-	;; A more strict, but still reasonable, policy may be to disallow the exchange 
-	;; of scripts, like so:
+    ;; Comma separated.
+    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;;
+    ;; Leave blank or commented if you don't want to apply any restrictions.
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
 
@@ -197,20 +197,19 @@
    	MapImageServerURI = "http://mygridserver.com:8003"
 
 [AuthorizationService]
-	; If you have regions with access restrictions
-	; specify them here using the convention
-	; Region_<Region_Name> = <flags>
-	; Valid flags are:
-	; DisallowForeigners -- HG visitors not allowed
-	; DisallowResidents -- only Admins and Managers allowed
-	; Example:
-	; Region_Test_1 = "DisallowForeigners"
-
+  ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
 
 ;; Uncomment if you are using SimianGrid for grid services
 [SimianGrid]
-        ;; SimianGrid services URL
-        ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
+    ;; SimianGrid services URL
+    ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
 
-        ;; Capability assigned by the grid administrator for the simulator
-        ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
\ No newline at end of file
+    ;; Capability assigned by the grid administrator for the simulator
+    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d416ee9..2a66b4c 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,10 +25,10 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	FriendsModule			= "HGFriendsModule"
-	MapImageService			= "MapImageServiceModule"
-	UserManagementModule	= "HGUserManagementModule"
-	SearchModule			= "BasicSearchModule"
+    FriendsModule			= "HGFriendsModule"
+    MapImageService			= "MapImageServiceModule"
+    UserManagementModule	= "HGUserManagementModule"
+    SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -73,7 +73,7 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
@@ -89,12 +89,13 @@
     LureModule = HGLureModule
 
 [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"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
+    ; in minutes
+    RefreshTime = 60
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 99a589c..f561dd5 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -91,6 +91,7 @@
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
-	;; 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
+
+    ;; 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/Standalone.ini b/bin/config-include/Standalone.ini
index 7b7beb2..424d8c8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,7 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService			= "MapImageServiceModule"
-	SearchModule			= "BasicSearchModule"
+    SearchModule			= "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
@@ -117,9 +117,10 @@
     DSTZone = "America/Los_Angeles;Pacific Standard Time"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+
+    ; in minutes
+    RefreshTime = 60
 
 ;; This should always be the very last thing on this file
 [Includes]
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f7545d4..12c5b95 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -28,25 +28,24 @@
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
 [Hypergrid]
-	; Uncomment the variables in this section only if you are in
-	; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server that
-	;; runs the UserAgentsService.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server
-	;; that runs the Gatekeeper service.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; GatekeeperURI = "http://127.0.0.1:9000"
-
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -266,20 +265,20 @@
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
 
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -302,7 +301,7 @@
     ;; Are local users allowed to visit other grids?
     ;; What user level? Use variables of this forrm:
     ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
-	;; (the default is true)
+    ;; (the default is true)
     ;; For example:
     ; ForeignTripsAllowed_Level_0 = false
     ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
@@ -310,45 +309,45 @@
     ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
     ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
-	;;
+    ;;
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
-	;; Comma separated.
-	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-	;;
-	;; Leave blank or commented if you don't want to apply any restrictions.
-	;; A more strict, but still reasonable, policy may be to disallow the exchange 
-	;; of scripts, like so:
+    ;; Comma separated.
+    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;;
+    ;; Leave blank or commented if you don't want to apply any restrictions.
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
 
 
 [HGInventoryAccessModule]
-	;; If you have these set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
-	; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "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.
-	;; true = allow exports, false = disallow exports. True by default.
+    ;; true = allow exports, false = disallow exports. True by default.
     ; OutboundPermission = True
 
-	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-	;; and available when they return. True by default.
-	;RestrictInventoryAccessAbroad = True
+    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+    ;; and available when they return. True by default.
+    ;RestrictInventoryAccessAbroad = True
 
 [HGFriendsModule]
     ; User level required to be able to send friendship invitations to foreign users
@@ -356,20 +355,20 @@
 
 [Messaging]
     ; === HG ONLY ===
-	;; If you have this set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]
-	;; User level from which local users are allowed to HG teleport. Default 0 (all users)
-	;LevelHGTeleport = 0
+    ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
+    ;LevelHGTeleport = 0
 
-	;; Are local users restricted from taking their appearance abroad?
-	;; Default is no restrictions
+    ;; Are local users restricted from taking their appearance abroad?
+    ;; Default is no restrictions
     ;RestrictAppearanceAbroad = false
 
-	;; If appearance is restricted, which accounts' appearances are allowed to be exported?
-	;; Comma-separated list of account names
+    ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
+    ;; Comma-separated list of account names
     AccountForAppearance = "Test User, Astronaut Smith"
 
 ;; UserProfiles Service
@@ -385,5 +384,3 @@
 
     UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
     AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-
-
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 4dd35c0..370ab90 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 [Startup]
-	WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
     AssetServices			= "HGAssetBroker"
@@ -20,12 +20,12 @@
     SimulationServices		= "RemoteSimulationConnectorModule"
     AvatarServices			= "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-	MapImageService			= "MapImageServiceModule"
+    MapImageService			= "MapImageServiceModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
-	UserManagementModule	= "HGUserManagementModule"
-	SearchModule			= "BasicSearchModule"
+    UserManagementModule	= "HGUserManagementModule"
+    SearchModule			= "BasicSearchModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
@@ -33,10 +33,10 @@
     NeighbourServiceInConnector			= true
     LibraryModule						= true
     LLLoginServiceInConnector			= true
-	GridInfoServiceInConnector			= true
+    GridInfoServiceInConnector			= true
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
-	MapImageServiceInConnector			= true
+    MapImageServiceInConnector			= true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -74,9 +74,9 @@
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [LibraryService]
-	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	LibraryName = "OpenSim Library"
-	DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -123,7 +123,7 @@
     LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
     GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
-	UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -132,9 +132,9 @@
     FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
    
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+    ; in minutes
+    RefreshTime = 60
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -148,8 +148,8 @@
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
 
 [UserAgentService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-	;; for the service
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -166,10 +166,10 @@
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-	;; alternatives:
-	;;  HG1.5, more permissive, not recommended, but still supported
+    ;; alternatives:
+    ;;  HG1.5, more permissive, not recommended, but still supported
     ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
-	;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
     ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -182,19 +182,19 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
-	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
-	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	GridService = "OpenSim.Services.GridService.dll:GridService"
-	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [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"
-	InGatekeeper = True
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    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
 [Includes]
-- 
cgit v1.1


From f76cc6036ebf446553ee5201321879538dafe3b2 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 21:35:55 -0500
Subject: * Added a Basic DOS protection container/base object for the most
 common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and
 <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login
 service as both an example, and good practice. * Applied the
 BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of
 the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and
 Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check
 for blocked users and check general velocity, 2. Track velocity per user,    
 It only jumps to 2 if it's getting a lot of requests, and state 1 is about as
 resource friendly as if it wasn't even there.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 12c5b95..75fd956 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -117,7 +117,7 @@
     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"
+    SRV_IMServerURI = "http://127.0.0.1:9000
 
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
@@ -150,6 +150,23 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ; Basic Login Service Dos Protection Tweaks
+    ; ;
+    ; ; Some Grids/Users use a transparent proxy that makes use of the X-Forwarded-For HTTP Header, If you do, set this to true
+    ; ; If you set this to true and you don't have a transparent proxy, it may allow attackers to put random things in the X-Forwarded-For header to
+    ; ;     get around this basic DOS protection.
+    ; DOSAllowXForwardedForHeader = false
+    ; ;
+    ; ; The protector adds up requests during this rolling period of time, default 10 seconds
+    ; DOSRequestTimeFrameMS = 10000
+    ; ;
+    ; ; The amount of requests in the above timeframe from the same endpoint that triggers protection
+    ; DOSMaxRequestsInTimeFrame = 5
+    ; ;
+    ; ; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
+    ; DOSForgiveClientAfterMS = 120000
+    ; ; 
+    ; ; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
-- 
cgit v1.1


From ff8a76825841533bdc5d534b6f58b2ab964ea6c6 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Sat, 12 Oct 2013 16:33:45 -0500
Subject: Fernando Oliveira's Postgress SQL Server Data Connector as a single
 commit. * Added PostGreSQL support * Added MySQL/MySQLXGroupData.cs *
 PostgreSQL data access implementation * PostgreSQL dll binarie and
 RegionStore.migrations * Migrations Scripts from MSSQL to POSTGRES * Postgres
 SQL Type fixes * Postgres SQL Connection string * Data type issues * more
 fixes * tests and +tests * UUID x string - FIGHT! * Fixed PG types to
 internal csharp types * More data type fix (PostgreSQL fields are case
 sensitive) :( * more field case sensitive fixes * changed the migration files
 to be case sensitive for fields. * fixed fields case * finished converting,
 now search for hidden bugs. * some more fixes * bool type fixed * more case
 fixes; * creatorID case fixed * case fields fixed * fixed default now() for
 TMStamp fields with don't allow nulls. * fix case sensitve for Region name
 and Estate name * fixed case for names for search * fix class name Error *
 Bug fixed on select and migrations * Un-Reverting my change due to Postgres
 issue with the ILIKE function * Fixed some issued for Diva Distro * Fixes for
 integration with Diva Distro * Added System.Core to prebuild.xml for PG
 project * Configured to make DIff for Push to OpenSim Project * Diffs only to
 PostgreSQL mods.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0a69dbf..5460c0a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,6 +26,12 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
     ; Uncomment the variables in this section only if you are in
     ; Hypergrid configuration. Otherwise, ignore.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 75fd956..ef4fb3c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -27,6 +27,12 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
     ; Uncomment the variables in this section only if you are in
     ; Hypergrid configuration. Otherwise, ignore.
-- 
cgit v1.1


From daf44cc65ed8e2a0158d42011ec8cbeef105d580 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Sat, 12 Oct 2013 20:47:10 -0400
Subject: fix missing " for variable SRV_IMServerURI in example file

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ef4fb3c..a368bb8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -123,7 +123,7 @@
     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
+    SRV_IMServerURI = "http://127.0.0.1:9000"
 
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
-- 
cgit v1.1


From 12f2648a578afa59b01d3fe1ae54faf90cc62e61 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Sat, 8 Mar 2014 15:41:26 -0500
Subject: set RefreshTime = 0 in [MapImageService] in Grid.ini and
 GridHypergrid.ini to eliminate memory leaking for Warp3D map tiler, these
 variables should be erased needs more discussion!

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 69a209a..e1b9b89 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -66,4 +66,4 @@
 	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
 
 	; in minutes
-	RefreshTime = 60
+	RefreshTime = 0
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 2a66b4c..21dbeca 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -98,4 +98,4 @@
     LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
 
     ; in minutes
-    RefreshTime = 60
+    RefreshTime = 0
-- 
cgit v1.1


From da990d01f258892ccd5702eaac654547badd409a Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Sat, 8 Mar 2014 15:57:19 -0500
Subject: set RefreshTime = 0 in [MapImageService] in Standalone.ini and
 StandaloneHypergrid.ini to eliminate memory leaking for Warp3D map tiler,
 these variables should be erased needs more discussion!

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 424d8c8..887257b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -120,7 +120,7 @@
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
     ; in minutes
-    RefreshTime = 60
+    RefreshTime = 0
 
 ;; This should always be the very last thing on this file
 [Includes]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 370ab90..3194b0b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -134,7 +134,7 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
     ; in minutes
-    RefreshTime = 60
+    RefreshTime = 0
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-- 
cgit v1.1


From e3c4936deabf76156c789a816ea3779e9b9afdc4 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Sat, 8 Mar 2014 16:28:45 -0500
Subject: remove RefreshTime = 0 from [MapImageService] in Standalone.ini,
 StandaloneHypergrid.ini, Grid.ini, GridHypergrid.ini they were redundant and
 would not allow variables in OpenSim.ini to be set to anything.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index e1b9b89..e7141a1 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -64,6 +64,3 @@
 
 [MapImageService]
 	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-
-	; in minutes
-	RefreshTime = 0
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 21dbeca..8f17527 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -96,6 +96,3 @@
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-
-    ; in minutes
-    RefreshTime = 0
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 887257b..ee07e74 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -119,9 +119,6 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
-    ; in minutes
-    RefreshTime = 0
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 3194b0b..f39cf09 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -133,8 +133,6 @@
    
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-    ; in minutes
-    RefreshTime = 0
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-- 
cgit v1.1


From fce3fca7f9bc81a0dd21976a8e790192736efb34 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 20 Dec 2013 05:44:54 -0500
Subject: Add the UserProfiles local service module to non-HG Standalone
 configuration.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ee07e74..0072be5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
     AuthorizationServices	= "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices      = "LocalSimulationConnectorModule"
-- 
cgit v1.1


From 13b2ac14253a5f9ec75ec9712d1fd2fe17d1d005 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 4 May 2014 20:54:42 -0700
Subject: Makes it possible to support grids in which all the simulators share
 all central services of a Robust server EXCEPT assets. In other words, grids
 where the simulators' assets are kept in one DB and the users' inventory
 assets are kept on another. When users rez items from inventory or take
 objects from world, an HG-like asset copy takes place between the 2 servers,
 the world asset server and the user's asset server. This makes the simulators
 independent of the central asset server.

Note that this an advanced configuration and requires some security strengthening coming up.
---
 bin/config-include/GridCommon.ini.example | 12 ++++++++++--
 1 file changed, 10 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 5460c0a..59eebd8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -160,13 +160,21 @@
     HomeURI = "http://mygridserver.com:8002"
     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
+    ;; set this to false. You may want to do this on sims that have licensed content.
+	;; Default is true.
+    ; OutboundPermission = True
 
     ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
     ;; and available when they return. True by default.
     ;RestrictInventoryAccessAbroad = True
 
+	;; Warning: advanced and unusual. Default is false.
+	;; Enables configurations where grids share user services, including inventory,
+	;; while separating regions' assets from users' assets. Asset transfer between 
+	;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ; CheckSeparateAssets = false
+    ; RegionHGAssetServerURI = http://mygridserver.com:8002
+
 
 [HGAssetService]
     ;
-- 
cgit v1.1


From fe779128b0c50f44cf479444444754298d829910 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 6 Jun 2014 11:04:53 -0700
Subject: Added simulation version compatibility check so that agents coming
 from 0.7.6 to a varregion running in 0.8 and above will be denied teleport,
 rather than be allowed and crash the viewer.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index e7141a1..419b40d 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -33,13 +33,17 @@
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
     ; It is used to control the teleport handoff process.
-    ; Valid values are 
+    ; Valid values are
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
     ; "SIMULATION/0.2"
-    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
     ;   - this protocol is more efficient than "SIMULATION/0.1"
     ; "SIMULATION/0.1" 
     ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
-    ConnectorProtocolVersion = "SIMULATION/0.2"
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8f17527..27cc9d8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -39,12 +39,16 @@
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
     ; It is used to control the teleport handoff process.
     ; Valid values are 
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
     ; "SIMULATION/0.2"
-    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
     ;   - this protocol is more efficient than "SIMULATION/0.1"
     ; "SIMULATION/0.1" 
     ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
-    ConnectorProtocolVersion = "SIMULATION/0.2"
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [Profile]
     Module = "BasicProfileModule"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 0072be5..887f4d8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -31,12 +31,16 @@
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
     ; It is used to control the teleport handoff process.
     ; Valid values are 
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
     ; "SIMULATION/0.2"
-    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
     ;   - this protocol is more efficient than "SIMULATION/0.1"
     ; "SIMULATION/0.1" 
     ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
-    ConnectorProtocolVersion = "SIMULATION/0.2"
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f39cf09..ccb80cb 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,12 +42,16 @@
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
     ; It is used to control the teleport handoff process.
     ; Valid values are 
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
     ; "SIMULATION/0.2"
-    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
     ;   - this protocol is more efficient than "SIMULATION/0.1"
     ; "SIMULATION/0.1" 
     ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
-    ConnectorProtocolVersion = "SIMULATION/0.2"
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
-- 
cgit v1.1


From ba233008cd250e43ffad5e6cb5e1fed8a6e87f80 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 6 Jul 2014 16:02:04 -0700
Subject: Changed GetUserInfo so that the exposure of user account details is
 ruled by a configuration variable. It's on by default.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a368bb8..2bbc316 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -337,6 +337,13 @@
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
+	;; This variable controls what is exposed to profiles of local users
+	;; as seen from outside of this grid. Leave it uncommented for exposing
+	;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+	;; to block this info from being exposed.
+	; ShowUserDetailsInHGProfile = True
+
+
 [HGInventoryService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
-- 
cgit v1.1


From 6048dfcd715615c0c90b485a72ebbe2641f16d41 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 18 Jul 2014 22:57:04 +0100
Subject: In grid mode, add SuppressConsoleCommands flag to [GridService] so
 that we can stop misleading grid service only console commands from
 registering.

We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
---
 bin/config-include/Grid.ini | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 419b40d..e9eaee3 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -55,8 +55,11 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-
     NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+
+    ; Because LocalGridServicesConnector starts this service, in grid mode we need to suppress
+    ; the inappropriate console commands that it registers.
+    SuppressConsoleCommands = true
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-- 
cgit v1.1


From e85291329bb6aececc8860ce3c7c87ce12c90c12 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Jul 2014 02:02:07 +0100
Subject: Add suppression of grid-side "show regions" command in simulator
 console for Hypergrid setups as well as normal grid.

Should have been done in recent commit 6048dfcd
Resolves http://opensimulator.org/mantis/view.php?id=7281
---
 bin/config-include/GridHypergrid.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 27cc9d8..8dadd76 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -79,6 +79,7 @@
 
     HypergridLinker = true
     AllowHypergridMapSearch = true
+    SuppressConsoleCommands = true
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-- 
cgit v1.1


From 10a8d2852e529fddb029ae333a3ae6a0f06f0182 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 3 Aug 2014 20:33:40 -0400
Subject: OpenSimExtras

Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
---
 bin/config-include/StandaloneCommon.ini.example | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2bbc316..c4ece54 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -105,6 +105,10 @@
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
+    ;; Allow supporting viewers to export content
+    ;; Set to false to prevent export
+    ExportSupported = true
+
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
@@ -128,6 +132,9 @@
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
 
+    ; Url to search service
+    ; SearchURL = "http://127.0.0.1:8002";
+
     ; The minimum user level required for a user to be able to login.  0 by default
     ; If you disable a particular user's account then you can set their login level below this number.
     ; You can also change this level from the console though these changes will not be persisted.
-- 
cgit v1.1


From 36a1f1c70cf65dbd07d53397e25931eb556c30b2 Mon Sep 17 00:00:00 2001
From: Roger Kirkman
Date: Fri, 26 Sep 2014 21:21:01 +0100
Subject: Add missing HGInventoryService responsible for creating My Suitcase
 to StandaloneHypergrid.ini

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ccb80cb..a3c7fa6 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -135,6 +135,10 @@
     AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
    
+    ; This inventory service will be used to initialize the user's inventory
+    HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+    HGInventoryServiceConstructorArg = "HGInventoryService"
+	
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
-- 
cgit v1.1


From 5f88ceab2269a0413b9a57674a0a1b097c374fd4 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 30 Nov 2014 13:59:23 -0500
Subject: Set configuration files to use key expansion for widely used common
 settings.

---
 bin/config-include/GridCommon.ini.example       | 48 ++++++++++----------
 bin/config-include/StandaloneCommon.ini.example | 58 ++++++++++++-------------
 2 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 59eebd8..2c3df8d 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,17 +40,17 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server that
     ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
     ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server
     ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
     ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -78,25 +78,25 @@
     ;
     ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
-    AssetServerURI = "http://mygridserver.com:8003"
+    AssetServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [InventoryService]
     ;
     ; Change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://mygridserver.com:8003"
+    InventoryServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [GridInfo]
     ;
     ; Change this to your grid info service
     ;
-    GridInfoURI = "http://mygridserver.com:8002"
+    GridInfoURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [GridService]
     ;
     ; Change this to your grid-wide grid server
     ;
-    GridServerURI = "http://mygridserver.com:8003"
+    GridServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
     ;AllowHypergridMapSearch = true
 
     ;; Directory for map tile images of linked regions
@@ -105,51 +105,51 @@
     ; === 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)
-    Gatekeeper="http://mygridserver.com:8002"
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
 [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)
-    Gatekeeper = "http://mygridserver.com:8002"
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
 
 [AvatarService]
     ;
     ; Change this to your grid-wide grid server
     ;
-    AvatarServerURI = "http://mygridserver.com:8003"
+    AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [PresenceService]
     ;
     ; Change this to your grid-wide presence server
     ;
-    PresenceServerURI = "http://mygridserver.com:8003"
+    PresenceServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [UserAccountService]
     ;
     ; Change this to your grid-wide user accounts server
     ;
-    UserAccountServerURI = "http://mygridserver.com:8003"
+    UserAccountServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [GridUserService]
     ;
     ; Change this to your grid-wide user accounts server
     ;
-    GridUserServerURI = "http://mygridserver.com:8003"
+    GridUserServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthenticationService]
     ;
     ; Change this to your grid-wide authentication server
     ;
-    AuthenticationServerURI = "http://mygridserver.com:8003"
+    AuthenticationServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [FriendsService]
     ;
     ; Change this to your grid-wide friends server
     ;
-    FriendsServerURI = "http://mygridserver.com:8003"
+    FriendsServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [HGInventoryAccessModule]
     ;
@@ -157,8 +157,8 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "http://mygridserver.com:8002"
-    Gatekeeper = "http://mygridserver.com:8002"
+    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
 	;; Default is true.
@@ -173,7 +173,7 @@
 	;; while separating regions' assets from users' assets. Asset transfer between 
 	;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
-    ; RegionHGAssetServerURI = http://mygridserver.com:8002
+    ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
 
 
 [HGAssetService]
@@ -182,7 +182,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "http://mygridserver.com:8002"
+    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
@@ -205,10 +205,10 @@
     ; === HG ONLY ===
     ; Change this to your user agent server (HG robust)
     ;
-    UserAgentServerURI = "http://mygridserver.com:8002"
+    UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [MapImageService]
-   	MapImageServerURI = "http://mygridserver.com:8003"
+   	MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthorizationService]
   ; If you have regions with access restrictions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index c4ece54..f0bf3c8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -41,17 +41,17 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server that
     ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server
     ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -111,7 +111,7 @@
 
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI="http://127.0.0.1:9000"
+    ; GatekeeperURI="${Const|BaseURL}:${Const|PublicPort}"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -120,20 +120,20 @@
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
     ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "http://127.0.0.1:9000"    
-    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"
+    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"    
+    SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_FriendsServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_IMServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; For Viewer 2
-    MapTileURL = "http://127.0.0.1:9000/"
+    MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"
 
     ; Url to search service
-    ; SearchURL = "http://127.0.0.1:8002";
+    ; SearchURL = "${Const|BaseURL}:8002";
 
     ; The minimum user level required for a user to be able to login.  0 by default
     ; If you disable a particular user's account then you can set their login level below this number.
@@ -227,7 +227,7 @@
     ; See http://opensimulator.org/wiki/GridInfo
 
     ; login uri: for grid this is the login server URI
-    login = http://127.0.0.1:9000/
+    login = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; long grid name: the long name of your grid
     gridname = "the lost continent of hippo"
@@ -238,37 +238,37 @@
     ; login page: optional: if it exists it will be used to tell the client to use
     ;                       this as splash page
     ; currently unused
-    ;welcome = http://127.0.0.1/welcome
+    ;welcome = ${Const|BaseURL}/welcome
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
     ;                       this for all economy related things
     ; currently unused
-    ;economy = http://127.0.0.1:9000/
+    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; web page of grid: optional: page providing further information about your grid
     ; currently unused
-    ;about = http://127.0.0.1/about/
+    ;about = ${Const|BaseURL}/about/
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
     ; currently unused
-    ;register = http://127.0.0.1/register
+    ;register = ${Const|BaseURL}/register
 
     ; help: optional: page providing further assistance for users of your grid
     ; currently unused
-    ;help = http://127.0.0.1/help
+    ;help = ${Const|BaseURL}/help
 
     ; password help: optional: page providing password assistance for users of your grid
     ; currently unused
-    ;password = http://127.0.0.1/password
+    ;password = ${Const|BaseURL}/password
 
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
-    ; gatekeeper = http://127.0.0.1:9000/
+    ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; HG user domain, if you have one
     ; this is the entry point for all user-related HG services
-    ; uas = http://127.0.0.1:9000/
+    ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 [MapImageService]
 	; Set this if you want to change the default
@@ -289,7 +289,7 @@
 ;;
 [GatekeeperService]
 	;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
-    ; ExternalName = "http://127.0.0.1:9000"
+    ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
@@ -353,11 +353,11 @@
 
 [HGInventoryService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [HGAssetService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
@@ -374,8 +374,8 @@
 
 [HGInventoryAccessModule]
     ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; 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.
@@ -393,7 +393,7 @@
 [Messaging]
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [EntityTransfer]
-- 
cgit v1.1


From d0f96444173d7650aa0b6b0be1eb8f2943fa58e8 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 30 Nov 2014 14:57:47 -0500
Subject: A little bit of cleanup behind commit r5f88ceab2269

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 2c3df8d..903641e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,7 +40,7 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server that
     ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
@@ -48,7 +48,7 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server
     ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f0bf3c8..edccf23 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -41,7 +41,7 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server that
     ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
@@ -49,7 +49,7 @@
     ;; If this is a standalone world, this is the address of this instance.
     ;; If this is a grided simulator, this is the address of the external robust server
     ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
@@ -133,7 +133,7 @@
     MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"
 
     ; Url to search service
-    ; SearchURL = "${Const|BaseURL}:8002";
+    ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}";
 
     ; The minimum user level required for a user to be able to login.  0 by default
     ; If you disable a particular user's account then you can set their login level below this number.
-- 
cgit v1.1


From 8e562f04d1576bd51138ac656f796ba18965fdcf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 6 Jan 2015 21:24:44 -0800
Subject: Donation of robust network connectors for estate service, as
 promised. This allows to have one central database for estates without having
 to open the MySql port. This is off by default, so not to disturb everyone's
 existing installations. To use it, see GridCommon.ini.example
 [EstateDataStore] section and Robust*.ini.example's new additions.

Note that I also made things consistent by removing both the EstateDataService and the SimulationService into their own dlls, just like all other services. They really didn't belong in Services.Connectors, since everything in that component is about network connectors to robust backends. We may have too many dlls, and at some point it might not be a bad idea to merge all services into one single dll, since they all have more or less the same dependencies.
---
 bin/config-include/Grid.ini                |  4 ++--
 bin/config-include/GridCommon.ini.example  | 10 ++++++++++
 bin/config-include/GridHypergrid.ini       |  4 ++--
 bin/config-include/SimianGrid.ini          |  4 ++--
 bin/config-include/Standalone.ini          |  4 ++--
 bin/config-include/StandaloneHypergrid.ini |  4 ++--
 6 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index e9eaee3..42ecec2 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -46,10 +46,10 @@
     ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 903641e..bffc504 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -108,6 +108,16 @@
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
+[EstateDataStore]
+	;
+	; Uncomment if you want centralized estate data at robust server,
+	; in which case the URL in [EstateService] will be used
+	;
+	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataConnector"
+
+[EstateService]
+	EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8dadd76..8b47ede 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -54,10 +54,10 @@
     Module = "BasicProfileModule"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 311a55b..8e42fab 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -42,10 +42,10 @@
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 887f4d8..398a76c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -43,10 +43,10 @@
     ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a3c7fa6..102947a 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -58,10 +58,10 @@
     LureModule = HGLureModule
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
-- 
cgit v1.1


From 16ff808595309729837d8cbc98b867b557235b4f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 7 Jan 2015 19:18:18 -0800
Subject: Fix name of EstateDataRemoteConnector in the comment.

---
 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 bffc504..8dc3a73 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -113,7 +113,7 @@
 	; Uncomment if you want centralized estate data at robust server,
 	; in which case the URL in [EstateService] will be used
 	;
-	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataConnector"
+	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
 
 [EstateService]
 	EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-- 
cgit v1.1


From d9bfc710c09d9a897657dd9c0286a064e7413cc6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 21 Jan 2015 00:54:13 +0000
Subject: Replace the tabs that have crept into isolated places in config and
 config example files with spaces

---
 bin/config-include/Grid.ini                     | 40 +++++------
 bin/config-include/GridCommon.ini.example       | 24 +++----
 bin/config-include/GridHypergrid.ini            | 46 ++++++-------
 bin/config-include/HyperSimianGrid.ini          |  2 +-
 bin/config-include/SimianGrid.ini               |  4 +-
 bin/config-include/Standalone.ini               |  6 +-
 bin/config-include/StandaloneCommon.ini.example | 32 ++++-----
 bin/config-include/StandaloneHypergrid.ini      | 91 ++++++++++++-------------
 8 files changed, 122 insertions(+), 123 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 42ecec2..4b01d82 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,27 +8,27 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices			= "RemoteAssetServicesConnector"
-    InventoryServices		= "RemoteXInventoryServicesConnector"
-    GridServices			= "RemoteGridServicesConnector"
-    AvatarServices			= "RemoteAvatarServicesConnector"
-    NeighbourServices		= "RemoteNeighbourServicesConnector"
-    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    PresenceServices		= "RemotePresenceServicesConnector"
-    UserAccountServices		= "RemoteUserAccountServicesConnector"
-    GridUserServices		= "RemoteGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    EntityTransferModule	= "BasicEntityTransferModule"
-    InventoryAccessModule	= "BasicInventoryAccessModule"
+    AssetServices           = "RemoteAssetServicesConnector"
+    InventoryServices       = "RemoteXInventoryServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    MapImageService			= "MapImageServiceModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector			= true
-    NeighbourServiceInConnector		= true
-    SimulationServiceInConnector	= true
-    LibraryModule					= true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -70,4 +70,4 @@
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 8dc3a73..4486f31 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -109,14 +109,14 @@
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
 [EstateDataStore]
-	;
-	; Uncomment if you want centralized estate data at robust server,
-	; in which case the URL in [EstateService] will be used
-	;
-	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
+    ;
+    ; Uncomment if you want centralized estate data at robust server,
+    ; in which case the URL in [EstateService] will be used
+    ;
+    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
 
 [EstateService]
-	EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [Messaging]
     ; === HG ONLY ===
@@ -171,17 +171,17 @@
     Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
-	;; Default is true.
+    ;; Default is true.
     ; OutboundPermission = True
 
     ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
     ;; and available when they return. True by default.
     ;RestrictInventoryAccessAbroad = True
 
-	;; Warning: advanced and unusual. Default is false.
-	;; Enables configurations where grids share user services, including inventory,
-	;; while separating regions' assets from users' assets. Asset transfer between 
-	;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ;; Warning: advanced and unusual. Default is false.
+    ;; Enables configurations where grids share user services, including inventory,
+    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
 
@@ -218,7 +218,7 @@
     UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [MapImageService]
-   	MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthorizationService]
   ; If you have regions with access restrictions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b47ede..21a5a22 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,32 +8,32 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Startup]
-	WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices			= "HGAssetBroker"
-    InventoryServices		= "HGInventoryBroker"
-    GridServices			= "RemoteGridServicesConnector"
-    AvatarServices			= "RemoteAvatarServicesConnector"
-    NeighbourServices		= "RemoteNeighbourServicesConnector"
-    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    PresenceServices		= "RemotePresenceServicesConnector"
-    UserAccountServices		= "RemoteUserAccountServicesConnector"
-    GridUserServices		= "RemoteGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    EntityTransferModule	= "HGEntityTransferModule"
-    InventoryAccessModule	= "HGInventoryAccessModule"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    FriendsModule			= "HGFriendsModule"
-    MapImageService			= "MapImageServiceModule"
-    UserManagementModule	= "HGUserManagementModule"
-    SearchModule			= "BasicSearchModule"
+    FriendsModule           = "HGFriendsModule"
+    MapImageService         = "MapImageServiceModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector			= true
-    NeighbourServiceInConnector		= true
-    SimulationServiceInConnector	= true
-    LibraryModule					= true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -96,7 +96,7 @@
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
     GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-    PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
     UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index f561dd5..efad577 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -55,7 +55,7 @@
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 8e42fab..5749656 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -53,7 +53,7 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-	NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -63,7 +63,7 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-	
+
 [Groups]
     Enabled = true
     Module  = GroupsModule
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 398a76c..6b91d9a 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,7 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
@@ -19,8 +19,8 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    MapImageService			= "MapImageServiceModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index edccf23..a11a931 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -271,24 +271,24 @@
     ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 [MapImageService]
-	; Set this if you want to change the default
-	; TilesStoragePath = "maptiles"
+    ; Set this if you want to change the default
+    ; TilesStoragePath = "maptiles"
 
 [AuthorizationService]
-	; If you have regions with access restrictions
-	; specify them here using the convention
-	; Region_<Region_Name> = <flags>
-	; Valid flags are:
-	; DisallowForeigners -- HG visitors not allowed
-	; DisallowResidents -- only Admins and Managers allowed
-	; Example:
-	; Region_Test_1 = "DisallowForeigners"
+    ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
 
 ;;
 ;; HG configurations
 ;;
 [GatekeeperService]
-	;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it?
@@ -344,11 +344,11 @@
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
-	;; This variable controls what is exposed to profiles of local users
-	;; as seen from outside of this grid. Leave it uncommented for exposing
-	;; UserTitle, UserFlags and the creation date. Uncomment and change to False
-	;; to block this info from being exposed.
-	; ShowUserDetailsInHGProfile = True
+    ;; This variable controls what is exposed to profiles of local users
+    ;; as seen from outside of this grid. Leave it uncommented for exposing
+    ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+    ;; to block this info from being exposed.
+    ; ShowUserDetailsInHGProfile = True
 
 
 [HGInventoryService]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 102947a..1be67db 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -8,35 +8,35 @@
     WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices			= "HGAssetBroker"
-    InventoryServices		= "HGInventoryBroker"
-    NeighbourServices		= "LocalNeighbourServicesConnector"
-    AuthenticationServices	= "LocalAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    GridServices			= "LocalGridServicesConnector"
-    PresenceServices		= "LocalPresenceServicesConnector"
-    UserAccountServices		= "LocalUserAccountServicesConnector"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    AvatarServices			= "LocalAvatarServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-    MapImageService			= "MapImageServiceModule"
-    EntityTransferModule	= "HGEntityTransferModule"
-    InventoryAccessModule	= "HGInventoryAccessModule"
-    FriendsModule			= "HGFriendsModule"
-    UserManagementModule	= "HGUserManagementModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
+    FriendsModule           = "HGFriendsModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    InventoryServiceInConnector			= true
-    AssetServiceInConnector				= true
-    HypergridServiceInConnector			= true
-    NeighbourServiceInConnector			= true
-    LibraryModule						= true
-    LLLoginServiceInConnector			= true
-    GridInfoServiceInConnector			= true
-    AuthenticationServiceInConnector	= true
-    SimulationServiceInConnector		= true
-    MapImageServiceInConnector			= true
+    InventoryServiceInConnector       = true
+    AssetServiceInConnector           = true
+    HypergridServiceInConnector       = true
+    NeighbourServiceInConnector       = true
+    LibraryModule                     = true
+    LLLoginServiceInConnector         = true
+    GridInfoServiceInConnector        = true
+    AuthenticationServiceInConnector  = true
+    SimulationServiceInConnector      = true
+    MapImageServiceInConnector        = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -90,13 +90,13 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
-	
+
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
   
     HypergridLinker = true
     AllowHypergridMapSearch = true
-	
+
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
     StorageProvider = "OpenSim.Data.Null.dll"
@@ -124,21 +124,21 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
-    UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
-    AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
-    PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService				= "OpenSim.Services.GridService.dll:GridService"
-    AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    UserAgentService      = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
    
     ; This inventory service will be used to initialize the user's inventory
     HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
     HGInventoryServiceConstructorArg = "HGInventoryService"
-	
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
@@ -158,15 +158,14 @@
     ;; for the service
     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"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
     CreateDefaultAvatarEntries = true
 
-	
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
@@ -198,8 +197,8 @@
 [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"
+    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


From 2a302d9a324190ed83091ac5c8a2cf02acf4fa70 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 12 Apr 2015 16:00:54 -0700
Subject: Move osslEnable.ini file from bin/ to bin/config-include.     Per
 comments, putting new configuration files in bin/ is not preferred. Add
 comments and instructions to heading of osslEnable.ini. Add a commented out
 include of osslEnable.ini to OpenSim.ini.example. Fix line endings of
 osslEnable.ini to be Unix style.

---
 bin/config-include/osslEnable.ini | 197 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100755 bin/config-include/osslEnable.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
new file mode 100755
index 0000000..ba814c6
--- /dev/null
+++ b/bin/config-include/osslEnable.ini
@@ -0,0 +1,197 @@
+; Enable OSSL functions.
+; Including this file in a region's set of INI files, causes the OpenSimulator
+;   specific functions to be enabled. 
+; See http://opensimulator.org/wiki/OSSL for a description of OSSL functions and
+;   refer to http://opensimulator.org/wiki/OSSL_Implemented for a list of functions.
+
+; The below file lists all the functions and specifies who has permission to
+;   execute the function. Some of the functions are for maintainance or can be
+;   mis-used so the permission to execute a function can be limited. Ability to
+;   execute a function is based on the owner of the prim holding the script.
+
+[XEngine]
+  AllowModFunctions = true
+  AllowOSFunctions = true
+  AllowLightshareFunctions = true
+
+  OSFunctionThreatLevel = VeryLow
+
+  ; Each of the OSSL functions can be enabled or disabled individually.
+  ; To disable, set the value to 'false'.
+  ; To enable for everyone, set the value to 'true'.
+  ; To enable for individuals or groups, set it to a comma separated list. This checks
+  ;    against the owner of the object containing the script.
+  ;    The comma separated entries in the list may be one of:
+  ;           "ESTATE_MANAGER" -- enable for estate manager
+  ;           "ESTATE_OWNER" -- enable for estate owner
+  ;           "PARCEL_OWNER" -- enable for parcel owner
+  ;           "PARCEL_GROUP_MEMBER" -- enable for any member of the parcel group
+  ;           uuid -- enable for owner of object with specified avatar ID
+
+  ; Allowing ossl functions for anyone owning a parcel can be dangerous especially if
+  ;    a region is selling or otherwise giving away parcel ownership. By default, parcel
+  ;    ownership or group membership does not enable OSSL functions. Uncomment the
+  ;    appropriate line below to allow parcel ownership and groups to do restricted
+  ;    OSSL functions.
+  osslParcelO = ""
+  osslParcelOG = ""
+  ; osslParcelO = "PARCEL_OWNER,"
+  ; osslParcelOG = "PARCEL_GROUP_MEMBER,PARCEL_OWNER,"
+               
+  ; ThreatLevel  None
+  Allow_osDrawEllipse =             true
+  Allow_osDrawFilledPolygon =       true
+  Allow_osDrawFilledRectangle =     true
+  Allow_osDrawImage =               true
+  Allow_osDrawLine =                true
+  Allow_osDrawPolygon =             true
+  Allow_osDrawRectangle =           true
+  Allow_osDrawText =                true
+  Allow_osGetAgents =               ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetAvatarList =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetCurrentSunHour =       true
+  Allow_osGetHealth =               true
+  Allow_osGetInventoryDesc  =       true
+  Allow_osGetMapTexture =           true
+  Allow_osGetRegionSize =           true
+  Allow_osGetRezzingObject =        true
+  Allow_osGetSunParam =             true
+  Allow_osGetTerrainHeight =        true
+  Allow_osIsNpc =                   true
+  Allow_osIsUUID =                  true
+  Allow_osList2Double =             true
+  Allow_osMax =                     true
+  Allow_osMin =                     true
+  Allow_osMovePen =                 true
+  Allow_osNpcGetOwner =             true
+  Allow_osParseJSON =               true
+  Allow_osParseJSONNew =            true
+  Allow_osSetFontName =             true
+  Allow_osSetFontSize =             true
+  Allow_osSetPenCap =               true
+  Allow_osSetPenColor =             true
+  Allow_osSetPenSize =              true
+  Allow_osSetSunParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osTeleportOwner =           true
+  Allow_osWindActiveModelPluginName = true
+  
+  ; ThreatLevel  Nuisance
+  Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetRegionSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
+  
+  ; ThreatLevel  VeryLow
+  Allow_osEjectFromGroup =          true
+  Allow_osForceBreakAllLinks =      true
+  Allow_osForceBreakLink =          true
+  Allow_osGetDrawStringSize =       true
+  Allow_osGetWindParam =            true
+  Allow_osInviteToGroup =           true
+  Allow_osReplaceString =           true
+  Allow_osSetDynamicTextureData =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureDataBlend =  ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureURL =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureURLBlend =   ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelMediaURL =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelSIPAddress =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetPrimFloatOnWater =     true
+  Allow_osSetWindParam =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osTerrainFlush =            ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osUnixTimeToTimestamp =     true
+  
+  ; ThreatLevel  Low
+  Allow_osAvatarName2Key =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osFormatString =            true
+  Allow_osKey2Name =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osListenRegex =             true
+  Allow_osLoadedCreationDate =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osLoadedCreationID =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osLoadedCreationTime =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osMessageObject =           true
+  Allow_osRegexIsMatch =            true
+  
+  ; ThreatLevel  Moderate
+  Allow_osDropAttachment =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osDropAttachmentAt =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridCustom =           ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridGatekeeperURI =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridHomeURI =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridLoginURI =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridName =             true
+  Allow_osGetGridNick =             true
+  Allow_osGetNumberOfAttachments =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetRegionStats =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetSimulatorMemory =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osMessageAttachments =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetSpeed =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  
+  ; High
+  Allow_osCauseDamage =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osCauseHealing =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceAttachToAvatar =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceAttachToAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceCreateLink =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDropAttachment =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDropAttachmentAt =   ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetAgentIP =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetLinkPrimitiveParams =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetPhysicsEngineType =    true
+  Allow_osGetPrimitiveParams =      true
+  Allow_osGetRegionMapTexture =     ESTATE_OWNER, ESTATE_MANAGER, PARCEL_OWNER
+  Allow_osGetScriptEngineName =     true
+  Allow_osGetSimulatorVersion =     true
+  Allow_osMakeNotecard =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osMatchString =             true
+  Allow_osNpcCreate =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcGetPos =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcGetRot =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcLoadAppearance =       ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcMoveTo =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcMoveToTarget =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcPlayAnimation =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcRemove =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSaveAppearance =       ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSay =                  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSetRot =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcShout =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSit =                  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcStand =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcStopAnimation =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcStopMoveToTarget =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcTouch =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcWhisper =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osOwnerSaveAppearance =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osParcelJoin =              ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetContentType =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetPrimitiveParams =      true
+  Allow_osSetProjectionParams =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetStateEvents =          false
+  Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetTerrainTexture =       ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetTerrainTextureHeight = ESTATE_MANAGER,ESTATE_OWNER
+  
+  ; VeryHigh
+  Allow_osAgentSaveAppearance =     ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osAvatarPlayAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osAvatarStopAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDetachFromAvatar =   ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osForceOtherSit =           ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osGetNotecard =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetNotecardLine =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRegionNotice =            ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osSetRot  =                 ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  
+  ; Severe
+  Allow_osConsoleCommand =          false
+  Allow_osForceAttachToOtherAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGrantScriptPermissions =  false
+  Allow_osKickAvatar =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRevokeScriptPermissions = false
+  Allow_osTeleportAgent =           ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  
-- 
cgit v1.1


From d96d31be4524f52715278d7b96c7b1755e763ad8 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 12 Apr 2015 19:32:06 -0700
Subject: Add warnings in osslEnable.ini about use of osAvatarPlayAnimation
 which forces animations   on avatars without requesting user permission.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index ba814c6..988060e 100755
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -74,6 +74,7 @@
   Allow_osSetSunParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTeleportOwner =           true
   Allow_osWindActiveModelPluginName = true
+  Allow_osCheckODE =                true
   
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
@@ -176,6 +177,9 @@
   
   ; VeryHigh
   Allow_osAgentSaveAppearance =     ESTATE_OWNER, ESTATE_MANAGER
+  ; Warning: The next function allows scripts to force animations on avatars without the user giving permission.
+  ;   Enabling this can allow forced animations which can trigger traumatic episodes in vulnerable populations.
+  ;   Similar things can be said for several of the 'force' functions. Enable with care and control.
   Allow_osAvatarPlayAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osAvatarStopAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osForceDetachFromAvatar =   ESTATE_OWNER, ESTATE_MANAGER
-- 
cgit v1.1


From 520e6ed6f38c6432ac115b37d1fd48934319ae61 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 14 Apr 2015 06:18:25 -0700
Subject: Remove ossl settings in XEngine section of OpenSim.ini.example with
 note to where   they were moved. At the moment, ossl settings are in the
 XEngine section although   they should apply to any LSLish script engine.
 Moves all ossl settings to osslEnable.ini Update osslEnable.ini with more
 decriptive comments and set some functions to be more   restrictive --
 especially the functions that allow scripts to do things to other   avatars
 and prims.

---
 bin/config-include/osslEnable.ini | 109 ++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 41 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 988060e..ce0e261 100755
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -10,10 +10,25 @@
 ;   execute a function is based on the owner of the prim holding the script.
 
 [XEngine]
-  AllowModFunctions = true
+  ; Allow the use of os* functions (some are dangerous)
   AllowOSFunctions = true
+
+  ; Allow the user of mod* functions.  This allows a script to pass messages
+  ;   to a region module via the modSendCommand() function and is used by some
+  ;   modules to extend the scripting language.
+  AllowMODFunctions = true
+
+  ; Allow the use of LightShare functions.
+  ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
   AllowLightshareFunctions = true
 
+  ; Threat level to allow. One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe.
+  ; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
+  ; This is the default level and can be overridden with the Allow_ specifications.
+  ; Blanket enabling the ossl functions is dangerous and we do not recommend setting higher
+  ;   than 'Low' unless you have a high level of trust in all the users that can run scripts
+  ;   in your simulator.  It is safer to explicitly allow certain types of user to run
+  ;   higher threat level OSSL functions, as detailed later on.
   OSFunctionThreatLevel = VeryLow
 
   ; Each of the OSSL functions can be enabled or disabled individually.
@@ -26,17 +41,27 @@
   ;           "ESTATE_OWNER" -- enable for estate owner
   ;           "PARCEL_OWNER" -- enable for parcel owner
   ;           "PARCEL_GROUP_MEMBER" -- enable for any member of the parcel group
-  ;           uuid -- enable for owner of object with specified avatar ID
+  ;           uuid -- enable for specified ID (may be avatar or group ID)
+
+  ; The OSSL function name is prepended with "Allow_" and it checks against
+  ;   the owners of the containing prim. There can also be entries beginning with
+  ;   'Creators_". The 'Creators_" parameters can only be a list of UUIDs and it is
+  ;   checked against the creator of the script itself.
 
   ; Allowing ossl functions for anyone owning a parcel can be dangerous especially if
   ;    a region is selling or otherwise giving away parcel ownership. By default, parcel
   ;    ownership or group membership does not enable OSSL functions. Uncomment the
   ;    appropriate line below to allow parcel ownership and groups to do restricted
-  ;    OSSL functions.
+  ;    OSSL functions. It might be better to check the list below and edit the ones
+  ;    to enable individually.
   osslParcelO = ""
   osslParcelOG = ""
   ; osslParcelO = "PARCEL_OWNER,"
   ; osslParcelOG = "PARCEL_GROUP_MEMBER,PARCEL_OWNER,"
+
+  ; There are a block of functions for creating and controlling NPCs.
+  ; These can be mis-used so limit use to those you can trust.
+  osslNPC =                         ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
                
   ; ThreatLevel  None
   Allow_osDrawEllipse =             true
@@ -72,21 +97,21 @@
   Allow_osSetPenColor =             true
   Allow_osSetPenSize =              true
   Allow_osSetSunParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osTeleportOwner =           true
+  Allow_osTeleportOwner =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osWindActiveModelPluginName = true
-  Allow_osCheckODE =                true
+  Allow_osCheckODE =                true    ; Here for completeness. This function cannot be turned off
   
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   
   ; ThreatLevel  VeryLow
-  Allow_osEjectFromGroup =          true
-  Allow_osForceBreakAllLinks =      true
-  Allow_osForceBreakLink =          true
+  Allow_osEjectFromGroup =          ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakAllLinks =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakLink =          ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetDrawStringSize =       true
   Allow_osGetWindParam =            true
-  Allow_osInviteToGroup =           true
+  Allow_osInviteToGroup =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osReplaceString =           true
   Allow_osSetDynamicTextureData =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetDynamicTextureDataBlend =  ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@@ -109,7 +134,7 @@
   Allow_osLoadedCreationDate =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osLoadedCreationID =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osLoadedCreationTime =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMessageObject =           true
+  Allow_osMessageObject =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegexIsMatch =            true
   
   ; ThreatLevel  Moderate
@@ -138,62 +163,64 @@
   Allow_osGetAgentIP =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetLinkPrimitiveParams =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetPhysicsEngineType =    true
-  Allow_osGetPrimitiveParams =      true
-  Allow_osGetRegionMapTexture =     ESTATE_OWNER, ESTATE_MANAGER, PARCEL_OWNER
+  Allow_osGetPrimitiveParams =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetRegionMapTexture =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetScriptEngineName =     true
   Allow_osGetSimulatorVersion =     true
   Allow_osMakeNotecard =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMatchString =             true
-  Allow_osNpcCreate =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcGetPos =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcGetRot =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcLoadAppearance =       ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcMoveTo =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcMoveToTarget =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcPlayAnimation =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcRemove =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSaveAppearance =       ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSay =                  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSetRot =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcShout =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSit =                  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcStand =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcStopAnimation =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcStopMoveToTarget =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcTouch =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcWhisper =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcCreate =               ${XEngine|osslNPC}
+  Allow_osNpcGetPos =               ${XEngine|osslNPC}
+  Allow_osNpcGetRot =               ${XEngine|osslNPC}
+  Allow_osNpcLoadAppearance =       ${XEngine|osslNPC}
+  Allow_osNpcMoveTo =               ${XEngine|osslNPC}
+  Allow_osNpcMoveToTarget =         ${XEngine|osslNPC}
+  Allow_osNpcPlayAnimation =        ${XEngine|osslNPC}
+  Allow_osNpcRemove =               ${XEngine|osslNPC}
+  Allow_osNpcSaveAppearance =       ${XEngine|osslNPC}
+  Allow_osNpcSay =                  ${XEngine|osslNPC}
+  Allow_osNpcSetRot =               ${XEngine|osslNPC}
+  Allow_osNpcShout =                ${XEngine|osslNPC}
+  Allow_osNpcSit =                  ${XEngine|osslNPC}
+  Allow_osNpcStand =                ${XEngine|osslNPC}
+  Allow_osNpcStopAnimation =        ${XEngine|osslNPC}
+  Allow_osNpcStopMoveToTarget =     ${XEngine|osslNPC}
+  Allow_osNpcTouch =                ${XEngine|osslNPC}
+  Allow_osNpcWhisper =              ${XEngine|osslNPC}
   Allow_osOwnerSaveAppearance =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osParcelJoin =              ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osParcelJoin =              ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetContentType =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetPrimitiveParams =      true
+  Allow_osSetPrimitiveParams =      false
   Allow_osSetProjectionParams =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetStateEvents =          false
+  Allow_osSetStateEvents =          false   ; deprecated
   Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTexture =       ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTextureHeight = ESTATE_MANAGER,ESTATE_OWNER
   
   ; VeryHigh
-  Allow_osAgentSaveAppearance =     ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osAgentSaveAppearance =     ESTATE_MANAGER,ESTATE_OWNER
   ; Warning: The next function allows scripts to force animations on avatars without the user giving permission.
   ;   Enabling this can allow forced animations which can trigger traumatic episodes in vulnerable populations.
   ;   Similar things can be said for several of the 'force' functions. Enable with care and control.
-  Allow_osAvatarPlayAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osAvatarStopAnimation =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceDetachFromAvatar =   ESTATE_OWNER, ESTATE_MANAGER
-  Allow_osForceOtherSit =           ESTATE_OWNER, ESTATE_MANAGER
+  ; Some of these were added as early functionality for NPCs. This has been replaced with the NPC functions.
+  Allow_osAvatarPlayAnimation =     false
+  Allow_osAvatarStopAnimation =     false
+  Allow_osForceDetachFromAvatar =   false
+  Allow_osForceOtherSit =           false
+  ; The notecard functions can cause a lot of load on the region if over used
   Allow_osGetNotecard =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetNotecardLine =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRegionNotice =            ESTATE_OWNER, ESTATE_MANAGER
-  Allow_osSetRot  =                 ESTATE_OWNER, ESTATE_MANAGER
+  Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetRot  =                 false
   Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   
   ; Severe
   Allow_osConsoleCommand =          false
-  Allow_osForceAttachToOtherAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceAttachToOtherAvatarFromInventory = false
   Allow_osGrantScriptPermissions =  false
   Allow_osKickAvatar =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRevokeScriptPermissions = false
-- 
cgit v1.1


From e4e58fad322c7e53ec725a616773294985332c7c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 14 Apr 2015 07:17:54 -0700
Subject: Enable OSSL functions by default using the osslEnable.ini
 configuration file.

This changes OpenSim.ini.example to, by default, include osslEnable.ini which
turns on the OSSL functions and limits who can do which operations.
---
 bin/config-include/osslEnable.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index ce0e261..7c53ec0 100755
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -88,7 +88,7 @@
   Allow_osMax =                     true
   Allow_osMin =                     true
   Allow_osMovePen =                 true
-  Allow_osNpcGetOwner =             true
+  Allow_osNpcGetOwner =             ${XEngine|osslNPC}
   Allow_osParseJSON =               true
   Allow_osParseJSONNew =            true
   Allow_osSetFontName =             true
-- 
cgit v1.1


From d271151504df5b44c36db0b831302da4c9356106 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Mon, 25 May 2015 20:52:27 -0400
Subject: fix file perms and change AllowLightshareFunctions to
 AllowLightShareFunctions

---
 bin/config-include/osslEnable.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 bin/config-include/osslEnable.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
old mode 100755
new mode 100644
index 7c53ec0..5dfa71c
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -20,7 +20,7 @@
 
   ; Allow the use of LightShare functions.
   ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
-  AllowLightshareFunctions = true
+  AllowLightShareFunctions = true
 
   ; Threat level to allow. One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe.
   ; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
-- 
cgit v1.1


From 22e0367203d6a9169c9a3faf080443382c713596 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 30 May 2015 15:10:21 -0700
Subject: Add an entry for osGetGender to config-include/osslEnable.ini. Thanks
 to Austin Tate for the suggestion.

---
 bin/config-include/osslEnable.ini | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 5dfa71c..ebb7b84 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -75,6 +75,7 @@
   Allow_osGetAgents =               ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetAvatarList =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetCurrentSunHour =       true
+  Allow_osGetGender =               true
   Allow_osGetHealth =               true
   Allow_osGetInventoryDesc  =       true
   Allow_osGetMapTexture =           true
@@ -152,7 +153,7 @@
   Allow_osMessageAttachments =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetSpeed =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   
-  ; High
+  ; ThreatLevel High
   Allow_osCauseDamage =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osCauseHealing =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osForceAttachToAvatar =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
@@ -200,7 +201,7 @@
   Allow_osSetTerrainTexture =       ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTextureHeight = ESTATE_MANAGER,ESTATE_OWNER
   
-  ; VeryHigh
+  ; ThreatLevel  VeryHigh
   Allow_osAgentSaveAppearance =     ESTATE_MANAGER,ESTATE_OWNER
   ; Warning: The next function allows scripts to force animations on avatars without the user giving permission.
   ;   Enabling this can allow forced animations which can trigger traumatic episodes in vulnerable populations.
@@ -218,7 +219,7 @@
   Allow_osSetRot  =                 false
   Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   
-  ; Severe
+  ; ThreatLevel  Severe
   Allow_osConsoleCommand =          false
   Allow_osForceAttachToOtherAvatarFromInventory = false
   Allow_osGrantScriptPermissions =  false
-- 
cgit v1.1


From 0fa94f222df8ed7f308730c3692bf2a774138718 Mon Sep 17 00:00:00 2001
From: Cinder
Date: Fri, 12 Jun 2015 18:48:07 -0600
Subject: Refactor AgentPreferences so that database operations happen
 centrally. the opensim way.

Signed-off-by: Diva Canto <diva@metaverseink.com>
---
 bin/config-include/Grid.ini                | 1 +
 bin/config-include/GridCommon.ini.example  | 6 ++++++
 bin/config-include/GridHypergrid.ini       | 1 +
 bin/config-include/Standalone.ini          | 1 +
 bin/config-include/StandaloneHypergrid.ini | 1 +
 5 files changed, 10 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4b01d82..3c61ee0 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -17,6 +17,7 @@
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     PresenceServices        = "RemotePresenceServicesConnector"
     UserAccountServices     = "RemoteUserAccountServicesConnector"
+    AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
     GridUserServices        = "RemoteGridUserServicesConnector"
     SimulationServices      = "RemoteSimulationConnectorModule"
     EntityTransferModule    = "BasicEntityTransferModule"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4486f31..0922cf5 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -131,6 +131,12 @@
     ;
     AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
+[AgentPreferencesService]
+    ;
+    ; Change this to your grid-wide avatar prefs server
+    ;
+    AgentPreferencesServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+
 [PresenceService]
     ;
     ; Change this to your grid-wide presence server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 21a5a22..aa64c2a 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -20,6 +20,7 @@
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     PresenceServices        = "RemotePresenceServicesConnector"
     UserAccountServices     = "RemoteUserAccountServicesConnector"
+    AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
     GridUserServices        = "RemoteGridUserServicesConnector"
     SimulationServices      = "RemoteSimulationConnectorModule"
     EntityTransferModule    = "HGEntityTransferModule"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6b91d9a..93a5437 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -14,6 +14,7 @@
     PresenceServices        = "LocalPresenceServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
+    AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices      = "LocalSimulationConnectorModule"
     AvatarServices          = "LocalAvatarServicesConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1be67db..43cb145 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -16,6 +16,7 @@
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
+    AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices      = "RemoteSimulationConnectorModule"
     AvatarServices          = "LocalAvatarServicesConnector"
-- 
cgit v1.1


From bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jun 2015 08:36:06 -0700
Subject: A few bug fixes for Agent Preferences to actually work. Also added
 missing config for standalone.

---
 bin/config-include/Standalone.ini          | 3 +++
 bin/config-include/StandaloneHypergrid.ini | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 93a5437..1fbd171 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -97,6 +97,9 @@
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
 
+[AgentPreferencesService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
+
 [LoginService]
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 43cb145..51f7fd0 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -124,6 +124,9 @@
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
 
+[AgentPreferencesService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
+
 [LoginService]
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-- 
cgit v1.1


From a7543a3391e4ee3b5be656b68d66cdbd524dd949 Mon Sep 17 00:00:00 2001
From: AliciaRaven
Date: Mon, 13 Jul 2015 13:19:30 +0100
Subject: Add config options for FSAssetService. The default is the original
 asset service.

Signed-off-by: Melanie Thielker <melanie@t-data.com>
---
 bin/config-include/GridAssets_Default.ini  |  3 +++
 bin/config-include/GridAssets_FSAssets.ini | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 bin/config-include/GridAssets_Default.ini
 create mode 100644 bin/config-include/GridAssets_FSAssets.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridAssets_Default.ini b/bin/config-include/GridAssets_Default.ini
new file mode 100644
index 0000000..8ab4143
--- /dev/null
+++ b/bin/config-include/GridAssets_Default.ini
@@ -0,0 +1,3 @@
+[AssetService]
+
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
\ No newline at end of file
diff --git a/bin/config-include/GridAssets_FSAssets.ini b/bin/config-include/GridAssets_FSAssets.ini
new file mode 100644
index 0000000..7d03518
--- /dev/null
+++ b/bin/config-include/GridAssets_FSAssets.ini
@@ -0,0 +1,18 @@
+[AssetService]
+
+    LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
+    
+    BaseDirectory = "./fsassets/data"
+    SpoolDirectory = "./fsassets/tmp"
+    
+    ;; Original service can be checked if FSAssets can not find an asset
+    FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
+    
+    ;; How many days since last updating the access time before its updated again when accessing an asset
+    ;; Reduces DB calls if asset is requested oftern. Default value 0
+    ;DaysBetweenAccessTimeUpdates = 30
+    
+    ;; Custom Database config (Leave blank to use grids default database configuration)
+    ;StorageProvider = ""
+    ;ConnectionString = ""
+    ;Realm = "fsassets"
\ No newline at end of file
-- 
cgit v1.1


From 3e90d28d33d10454016f4d3a8afec007186cd427 Mon Sep 17 00:00:00 2001
From: AliciaRaven
Date: Wed, 22 Jul 2015 12:29:57 +0100
Subject: Robust config loader does not support config includes. Replace these
 additions for FSAssets with direct options in robust.ini example files
 instead.

As suggested by Orenh in mantis 7644, in the future it would be beneficial and less confusing to use only 1 of the 3 current config loaders.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
---
 bin/config-include/GridAssets_Default.ini  |  3 ---
 bin/config-include/GridAssets_FSAssets.ini | 18 ------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 bin/config-include/GridAssets_Default.ini
 delete mode 100644 bin/config-include/GridAssets_FSAssets.ini

(limited to 'bin/config-include')

diff --git a/bin/config-include/GridAssets_Default.ini b/bin/config-include/GridAssets_Default.ini
deleted file mode 100644
index 8ab4143..0000000
--- a/bin/config-include/GridAssets_Default.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[AssetService]
-
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
\ No newline at end of file
diff --git a/bin/config-include/GridAssets_FSAssets.ini b/bin/config-include/GridAssets_FSAssets.ini
deleted file mode 100644
index 7d03518..0000000
--- a/bin/config-include/GridAssets_FSAssets.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[AssetService]
-
-    LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
-    
-    BaseDirectory = "./fsassets/data"
-    SpoolDirectory = "./fsassets/tmp"
-    
-    ;; Original service can be checked if FSAssets can not find an asset
-    FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
-    
-    ;; How many days since last updating the access time before its updated again when accessing an asset
-    ;; Reduces DB calls if asset is requested oftern. Default value 0
-    ;DaysBetweenAccessTimeUpdates = 30
-    
-    ;; Custom Database config (Leave blank to use grids default database configuration)
-    ;StorageProvider = ""
-    ;ConnectionString = ""
-    ;Realm = "fsassets"
\ No newline at end of file
-- 
cgit v1.1


From 86c426e5870a2b91831eeb86cb9372e18e43b6c7 Mon Sep 17 00:00:00 2001
From: Christopher
Date: Tue, 4 Aug 2015 09:00:24 +0200
Subject: create osGetAvatarHomeURI

Signed-off-by: Melanie Thielker <melanie@t-data.com>
---
 bin/config-include/osslEnable.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/config-include')

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index ebb7b84..0a03d4c 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -137,6 +137,7 @@
   Allow_osLoadedCreationTime =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageObject =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegexIsMatch =            true
+  Allow_osGetAvatarHomeURI = 		${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   
   ; ThreatLevel  Moderate
   Allow_osDropAttachment =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-- 
cgit v1.1


From 3a27b4759380d26e74a128c0818052fb02ccd767 Mon Sep 17 00:00:00 2001
From: Ai Austin
Date: Fri, 21 Aug 2015 16:01:40 +0100
Subject: Refine comments .ini file setup for new Standalone

Helpful comment for setting [const] section of OpenSim.ini to allow for
standalone. Correction to StandaloneCommon.ini.example as
[GridInfoServices] welcome parameter does work and is also useful for
standalones.
---
 bin/config-include/StandaloneCommon.ini.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a11a931..1063040 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -236,8 +236,8 @@
     gridnick = "hippogrid"
 
     ; login page: optional: if it exists it will be used to tell the client to use
-    ;                       this as splash page
-    ; currently unused
+    ; this as splash page. May also be served from an external web server, e.g. for
+    ; information on a standalone
     ;welcome = ${Const|BaseURL}/welcome
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
-- 
cgit v1.1


From 9d104f54537eddd7bd25570fb15eaaee652da62d Mon Sep 17 00:00:00 2001
From: Ai Austin
Date: Tue, 25 Aug 2015 11:22:03 +0100
Subject: Changes to .ini.example files to improve instructions and workflow
 for standalone setups

Clarify what must be changed in initial .ini files to create a working
standalone setup now that [Const] variables are used. Fix separator used
in one of choice lists for [Const] BaseURL descriptor. Minor changes to
line spacing of some sections in StandaloneCommon.ini.example file for
layout regularity. Correction of a typo in comment.

Signed-off-by: Diva Canto <diva@metaverseink.com>
---
 bin/config-include/StandaloneCommon.ini.example | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1063040..09c902c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -54,12 +54,12 @@
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
-    ;; Choose one cache module and the corresponding config file, if it exists.
+    ;; Optionally choose one cache module and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and alter that
     ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
+    ;AssetCaching = "FlotsamAssetCache"
+    ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
     ;AssetCaching = "CenomeMemoryAssetCache"
     ;Include-CenomeCache = "config-include/CenomeCache.ini"
@@ -73,7 +73,6 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-
 [GridService]
     ;; For in-memory region storage (default)
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
@@ -84,7 +83,7 @@
     ; MapTileDirectory = "./maptiles"
 
     ;; Next, we can specify properties of regions, including default and fallback regions
-    ;; The syntax is: Region_<RegioName> = "<flags>"
+    ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
     ;;  
     ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
@@ -350,7 +349,6 @@
     ;; to block this info from being exposed.
     ; ShowUserDetailsInHGProfile = True
 
-
 [HGInventoryService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -371,7 +369,6 @@
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
 
-
 [HGInventoryAccessModule]
     ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -395,7 +392,6 @@
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-
 [EntityTransfer]
     ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
     ;LevelHGTeleport = 0
@@ -408,12 +404,10 @@
     ;; Comma-separated list of account names
     AccountForAppearance = "Test User, Astronaut Smith"
 
-;; UserProfiles Service
-;;
-;; To use, set Enabled to true then configure for your site...
 [UserProfilesService]
-    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    ;; To use, set Enabled to true then configure for your site...
     Enabled = false
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
 
     ;; Configure this for separate databse
     ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-- 
cgit v1.1


From 0540e250813c4ddddd11beb5b48bd4cb2efc28d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 25 Aug 2015 21:32:38 -0700
Subject: Still about Ai's patch: it turns out OpenSim doesn't work well
 without an asset cache because of temporary assets. So setting the default
 asset cache to Cenome, which is the in-memory cache.

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

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 09c902c..a60f9c0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -61,8 +61,8 @@
     ;AssetCaching = "FlotsamAssetCache"
     ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    ;Include-CenomeCache = "config-include/CenomeCache.ini"
+    AssetCaching = "CenomeMemoryAssetCache"
+    Include-CenomeCache = "config-include/CenomeCache.ini"
 
     ;AssetCaching = "GlynnTuckerAssetCache"
 
-- 
cgit v1.1


From e64f7abd6c8ed341b61200cae2baad52a44ef67c Mon Sep 17 00:00:00 2001
From: Ai Austin
Date: Wed, 26 Aug 2015 15:27:10 +0100
Subject: Restore FlotsamAssetCache as default and pre-enabled asset cache
 module

Keep FlotsamAssetCache as default and pre-enabled asset cache module in
StandaloneCommon.ini./example to have common behaviour between grids and
standalones.  Asset cache is needed to better support temporary assets
and texture drawing functions.
---
 bin/config-include/StandaloneCommon.ini.example | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a60f9c0..179be94 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -54,15 +54,15 @@
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
-    ;; Optionally choose one cache module and the corresponding config file, if it exists.
+    ;; Choose one cache module and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and alter that
     ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
-    ;AssetCaching = "FlotsamAssetCache"
-    ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
-    AssetCaching = "CenomeMemoryAssetCache"
-    Include-CenomeCache = "config-include/CenomeCache.ini"
+    ;AssetCaching = "CenomeMemoryAssetCache"
+    ;Include-CenomeCache = "config-include/CenomeCache.ini"
 
     ;AssetCaching = "GlynnTuckerAssetCache"
 
-- 
cgit v1.1