From 5a4fda9dc3aca873bcf034877eed1f9c5914493f Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 16 Oct 2009 11:09:18 -0700
Subject: Updating OpenSim.ini.example with the section required to enable a
useful prioritization scheme
---
bin/OpenSim.ini.example | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 002745d..ba797e6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1385,6 +1385,14 @@
;
;TextureDataLimit = 5
+[InterestManagement]
+ ; This section controls how state updates are prioritized for each client
+ UpdatePrioritizationScheme = Distance
+ ReprioritizeUpdate = true
+ RootUpdateReprioritizationDistance = 10.0
+ ChildUpdateReprioritizationDistance = 20.0
+ ReprioritizeUpdatesInterval = 5000.0
+
;;
;; These are defaults that are overwritten below in [Architecture].
;; These defaults allow OpenSim to work out of the box with
--
cgit v1.1
From a3f93cffb4fb9cb9865fe5a1815c547fa02d092c Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sat, 17 Oct 2009 22:06:36 -0700
Subject: * Committing Nini.dll with the patch from #3773 applied * Fixing a
log message typo
---
bin/Nini.dll | Bin 69632 -> 61440 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Nini.dll b/bin/Nini.dll
index cbe1050..745057c 100644
Binary files a/bin/Nini.dll and b/bin/Nini.dll differ
--
cgit v1.1
From fdce1be3db287bed901332b90ba57165e201d3fc Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 19 Oct 2009 16:52:27 -0700
Subject: * Removed OpenSim.Data.NHibernate * Replaced calls to
ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem()
since OpenSim does not use Code Access Security sandboxing
---
bin/AssetInventoryServer.ini.example | 6 ------
bin/NHibernate.Mapping.Attributes.dll | Bin 231936 -> 0 bytes
bin/NHibernate.dll | Bin 1638400 -> 0 bytes
bin/OpenSim.32BitLaunch.exe.config | 6 ------
bin/OpenSim.Grid.UserServer.exe.config | 6 ------
bin/OpenSim.exe.config | 6 ------
bin/OpenSim.ini.example | 6 ------
7 files changed, 30 deletions(-)
delete mode 100644 bin/NHibernate.Mapping.Attributes.dll
delete mode 100644 bin/NHibernate.dll
(limited to 'bin')
diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example
index 20e7ba6..8cfc1f8 100644
--- a/bin/AssetInventoryServer.ini.example
+++ b/bin/AssetInventoryServer.ini.example
@@ -104,11 +104,9 @@ frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,Brow
; supported by OpenSim is supported.
asset_database_provider = "OpenSim.Data.SQLite.dll"
;asset_database_provider = "OpenSim.Data.MySQL.dll"
-;asset_database_provider = "OpenSim.Data.NHibernate.dll"
inventory_database_provider = "OpenSim.Data.SQLite.dll"
;inventory_database_provider = "OpenSim.Data.MySQL.dll"
-;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
; Database connection string used by the database backend.
@@ -119,7 +117,3 @@ inventory_database_connect = "URI=file:Inventory.db,version=3"
; For MySQL
;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
-
-; For NHibernate
-;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
-;inventory_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
diff --git a/bin/NHibernate.Mapping.Attributes.dll b/bin/NHibernate.Mapping.Attributes.dll
deleted file mode 100644
index 4e965a4..0000000
Binary files a/bin/NHibernate.Mapping.Attributes.dll and /dev/null differ
diff --git a/bin/NHibernate.dll b/bin/NHibernate.dll
deleted file mode 100644
index 392852e..0000000
Binary files a/bin/NHibernate.dll and /dev/null differ
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index ce6175b..6ac0206 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -23,12 +23,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.Grid.UserServer.exe.config b/bin/OpenSim.Grid.UserServer.exe.config
index d73c2f4..315e69d 100644
--- a/bin/OpenSim.Grid.UserServer.exe.config
+++ b/bin/OpenSim.Grid.UserServer.exe.config
@@ -18,12 +18,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index b7fe1ea..c2d93c0 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,12 +24,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ba797e6..2d56f4e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -258,12 +258,9 @@
; Inventory database provider
inventory_plugin = "OpenSim.Data.SQLite.dll"
; inventory_plugin = "OpenSim.Data.MySQL.dll"
- ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
; Inventory source SQLite example
inventory_source = "URI=file:inventoryStore.db,version=3"
- ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
- ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
; Inventory Source MySQL example
;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
@@ -277,12 +274,9 @@
;
userDatabase_plugin = "OpenSim.Data.SQLite.dll"
; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
- ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
; User source SQLite example
user_source = "URI=file:userprofiles.db,version=3"
- ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
- ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
; User Source MySQL example
;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
--
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')
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 8a336c6860d66b9fbba6922c32e7a57fd355c57e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Oct 2009 02:28:53 +0100
Subject: Add MaxPoolThreads in startup to limit the size of the thread pool
used for FireAndForget. This lets us limit concurrency to make OpenSim play
nice
---
bin/OpenSim.ini.example | 3 +++
1 file changed, 3 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2d56f4e..92e6d91 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -42,6 +42,9 @@
; Set this to the DLL containing the client stack to use.
clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
+ ; Max threads to allocate on the FireAndForget pool
+ MaxPoolThreads = 30
+
; ##
; ## REGIONS
; ##
--
cgit v1.1
From 8ce4fd7234bd460652f6159a3b7a21d2bebee05d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Oct 2009 04:02:26 +0100
Subject: Reduce the default pool threads to 15 (from 30) and the minimum from
5 to 2
---
bin/OpenSim.ini.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 92e6d91..25d3f39 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -43,7 +43,7 @@
clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
; Max threads to allocate on the FireAndForget pool
- MaxPoolThreads = 30
+ MaxPoolThreads = 15
; ##
; ## REGIONS
--
cgit v1.1
From 32ccd5bb40447ea4d96f1181cf73edff3645a55a Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 21 Oct 2009 23:03:18 -0700
Subject: * Changed the misc. methods calling
ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget() * Changed
Util.FireAndForget() to use any of five different methods set with
async_call_method in the [Startup] section of OpenSim.ini. Look at the
example config for possible values
---
bin/OpenSim.ini.example | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2d56f4e..35b08f9 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -31,6 +31,15 @@
; 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
+ async_call_method = UnsafeQueueUserWorkItem
; ##
; ## CLIENTS
--
cgit v1.1