8 files changed, 8 insertions, 30 deletions

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
--- a/bin/NHibernate.Mapping.Attributes.dll
+++ /dev/null
diff --git a/bin/NHibernate.dll b/bin/NHibernate.dll
deleted file mode 100644
index 392852e..0000000
--- a/bin/NHibernate.dll
+++ /dev/null
diff --git a/bin/Nini.dll b/bin/Nini.dll
index cbe1050..745057c 100644
--- a/bin/Nini.dll
+++ b/bin/Nini.dll
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 @@
       </layout>
     </appender>
 
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
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 @@
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
 
     <root>
       <level value="DEBUG" />
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 @@
       </layout>
     </appender>
 
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 002745d..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=****;"
 
@@ -1385,6 +1379,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