aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-10-22 07:12:10 +0100
committerMelanie2009-10-22 07:12:10 +0100
commitc4969d47d9bbc22b37054451cd31451ca8d8c78a (patch)
tree788e3b034254bcf068ca950ee97a78b6aa07b386 /bin
parentMerge branch 'master' into vehicles (diff)
parentRemove the "mel_t" from version string (diff)
downloadopensim-SC_OLD-c4969d47d9bbc22b37054451cd31451ca8d8c78a.zip
opensim-SC_OLD-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.gz
opensim-SC_OLD-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.bz2
opensim-SC_OLD-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'bin')
-rw-r--r--bin/AssetInventoryServer.ini.example6
-rw-r--r--bin/NHibernate.Mapping.Attributes.dllbin231936 -> 0 bytes
-rw-r--r--bin/NHibernate.dllbin1638400 -> 0 bytes
-rw-r--r--bin/Nini.dllbin69632 -> 61440 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.exe.config6
-rw-r--r--bin/OpenSim.Grid.UserServer.exe.config6
-rw-r--r--bin/OpenSim.exe.config6
-rw-r--r--bin/OpenSim.ini.example26
-rw-r--r--bin/config-include/GridCommon.ini.example4
9 files changed, 24 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
104; supported by OpenSim is supported. 104; supported by OpenSim is supported.
105asset_database_provider = "OpenSim.Data.SQLite.dll" 105asset_database_provider = "OpenSim.Data.SQLite.dll"
106;asset_database_provider = "OpenSim.Data.MySQL.dll" 106;asset_database_provider = "OpenSim.Data.MySQL.dll"
107;asset_database_provider = "OpenSim.Data.NHibernate.dll"
108 107
109inventory_database_provider = "OpenSim.Data.SQLite.dll" 108inventory_database_provider = "OpenSim.Data.SQLite.dll"
110;inventory_database_provider = "OpenSim.Data.MySQL.dll" 109;inventory_database_provider = "OpenSim.Data.MySQL.dll"
111;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
112 110
113; Database connection string used by the database backend. 111; Database connection string used by the database backend.
114 112
@@ -119,7 +117,3 @@ inventory_database_connect = "URI=file:Inventory.db,version=3"
119; For MySQL 117; For MySQL
120;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 118;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
121;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 119;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
122
123; For NHibernate
124;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
125;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
Binary files differ
diff --git a/bin/NHibernate.dll b/bin/NHibernate.dll
deleted file mode 100644
index 392852e..0000000
--- a/bin/NHibernate.dll
+++ /dev/null
Binary files differ
diff --git a/bin/Nini.dll b/bin/Nini.dll
index cbe1050..745057c 100644
--- a/bin/Nini.dll
+++ b/bin/Nini.dll
Binary files 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 @@
23 </layout> 23 </layout>
24 </appender> 24 </appender>
25 25
26 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
27 <logger name="NHibernate" additivity="false">
28 <level value="INFO"/>
29 <appender-ref ref="NHibernateFileLog"/>
30 </logger>
31
32 <root> 26 <root>
33 <level value="DEBUG" /> 27 <level value="DEBUG" />
34 <appender-ref ref="Console" /> 28 <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 @@
18 <conversionPattern value="%date %-5level - %logger %message%newline" /> 18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout> 19 </layout>
20 </appender> 20 </appender>
21 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
22 <logger name="NHibernate" additivity="false">
23 <level value="INFO"/>
24 <appender-ref ref="NHibernateFileLog"/>
25 </logger>
26
27 21
28 <root> 22 <root>
29 <level value="DEBUG" /> 23 <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 @@
24 </layout> 24 </layout>
25 </appender> 25 </appender>
26 26
27 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
28 <logger name="NHibernate" additivity="false">
29 <level value="INFO"/>
30 <appender-ref ref="NHibernateFileLog"/>
31 </logger>
32
33 <root> 27 <root>
34 <level value="DEBUG" /> 28 <level value="DEBUG" />
35 <appender-ref ref="Console" /> 29 <appender-ref ref="Console" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 002745d..79d57d2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -31,6 +31,15 @@
31 31
32 ; To run a script every few minutes, set the script filename here 32 ; To run a script every few minutes, set the script filename here
33 ; timer_Script = "filename" 33 ; timer_Script = "filename"
34
35 ; ##
36 ; ## SYSTEM
37 ; ##
38
39 ; Sets the method that OpenSim will use to fire asynchronous
40 ; events. Valid values are UnsafeQueueUserWorkItem,
41 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread
42 ; async_call_method = SmartThreadPool
34 43
35 ; ## 44 ; ##
36 ; ## CLIENTS 45 ; ## CLIENTS
@@ -42,6 +51,9 @@
42 ; Set this to the DLL containing the client stack to use. 51 ; Set this to the DLL containing the client stack to use.
43 clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll" 52 clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
44 53
54 ; Max threads to allocate on the FireAndForget pool
55 MaxPoolThreads = 15
56
45 ; ## 57 ; ##
46 ; ## REGIONS 58 ; ## REGIONS
47 ; ## 59 ; ##
@@ -258,12 +270,9 @@
258 ; Inventory database provider 270 ; Inventory database provider
259 inventory_plugin = "OpenSim.Data.SQLite.dll" 271 inventory_plugin = "OpenSim.Data.SQLite.dll"
260 ; inventory_plugin = "OpenSim.Data.MySQL.dll" 272 ; inventory_plugin = "OpenSim.Data.MySQL.dll"
261 ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
262 273
263 ; Inventory source SQLite example 274 ; Inventory source SQLite example
264 inventory_source = "URI=file:inventoryStore.db,version=3" 275 inventory_source = "URI=file:inventoryStore.db,version=3"
265 ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
266 ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
267 ; Inventory Source MySQL example 276 ; Inventory Source MySQL example
268 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" 277 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
269 278
@@ -277,12 +286,9 @@
277 ; 286 ;
278 userDatabase_plugin = "OpenSim.Data.SQLite.dll" 287 userDatabase_plugin = "OpenSim.Data.SQLite.dll"
279 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll" 288 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
280 ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
281 289
282 ; User source SQLite example 290 ; User source SQLite example
283 user_source = "URI=file:userprofiles.db,version=3" 291 user_source = "URI=file:userprofiles.db,version=3"
284 ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
285 ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
286 ; User Source MySQL example 292 ; User Source MySQL example
287 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" 293 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
288 294
@@ -1385,6 +1391,14 @@
1385 ; 1391 ;
1386 ;TextureDataLimit = 5 1392 ;TextureDataLimit = 5
1387 1393
1394[InterestManagement]
1395 ; This section controls how state updates are prioritized for each client
1396 UpdatePrioritizationScheme = Distance
1397 ReprioritizeUpdate = true
1398 RootUpdateReprioritizationDistance = 10.0
1399 ChildUpdateReprioritizationDistance = 20.0
1400 ReprioritizeUpdatesInterval = 5000.0
1401
1388;; 1402;;
1389;; These are defaults that are overwritten below in [Architecture]. 1403;; These are defaults that are overwritten below in [Architecture].
1390;; These defaults allow OpenSim to work out of the box with 1404;; These defaults allow OpenSim to work out of the box with
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 @@
32 ;Include-CenomeCache = "config-include/CenomeCache.ini" 32 ;Include-CenomeCache = "config-include/CenomeCache.ini"
33 33
34 ;AssetCaching = "GlynnTuckerAssetCache" 34 ;AssetCaching = "GlynnTuckerAssetCache"
35
36 ;; Optionally, the port for the LLProxyLoginModule module can be changed
37
38 ;Setup_LLProxyLoginModule = "9090/"