aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-11-03 19:11:09 +0000
committerJustin Clark-Casey (justincc)2009-11-03 19:11:09 +0000
commitaf0e5d097480de264e7501e7d5d35328be5640bb (patch)
tree4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /bin
parentminor: remove some mono compiler warnings (diff)
parentFixed a couple of NREs in corner cases. (diff)
downloadopensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.zip
opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz
opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2
opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/OpenMetaverse.dllbin1642496 -> 1650688 bytes
-rw-r--r--bin/OpenMetaverse.dll.config6
-rw-r--r--bin/OpenMetaverseTypes.dllbin102400 -> 102400 bytes
-rw-r--r--bin/OpenSim.ini.example28
-rw-r--r--bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.sobin128164 -> 124540 bytes
-rw-r--r--bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.sobin142584 -> 142616 bytes
-rw-r--r--bin/openjpeg-dotnet-x86_64.dllbin0 -> 843776 bytes
-rw-r--r--bin/openjpeg-dotnet.dllbin187392 -> 187392 bytes
8 files changed, 22 insertions, 12 deletions
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 8b07942..edbf3ce 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 489ee6b..13fdc11 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" /> 4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
5 <dllmap os="!windows,osx" cpu="s390x" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-s390x" /> 5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
6 <dllmap os="!windows,osx" cpu="ppc64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-ppc64" /> 6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
7</configuration> 7</configuration>
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 331d58b..95d6021 100644
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 927eb7a..6606270 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -42,7 +42,7 @@
42 ; SmartThreadPool is reported to work well on Mono/Linux, but 42 ; SmartThreadPool is reported to work well on Mono/Linux, but
43 ; UnsafeQueueUserWorkItem has been benchmarked with better 43 ; UnsafeQueueUserWorkItem has been benchmarked with better
44 ; performance on .NET/Windows 44 ; performance on .NET/Windows
45 ;async_call_method = SmartThreadPool 45 async_call_method = SmartThreadPool
46 46
47 ; There are several operations on large collections (such as 47 ; There are several operations on large collections (such as
48 ; the current avatar list) that can be run synchronously or 48 ; the current avatar list) that can be run synchronously or
@@ -148,7 +148,7 @@
148 MaximumTimeBeforePersistenceConsidered = 600 148 MaximumTimeBeforePersistenceConsidered = 600
149 149
150 ; Should avatars in neighbor sims see objects in this sim? 150 ; Should avatars in neighbor sims see objects in this sim?
151 see_into_this_sim_from_neighbor = True 151 see_into_this_sim_from_neighbor = true
152 152
153 ; ## 153 ; ##
154 ; ## PHYSICS 154 ; ## PHYSICS
@@ -399,13 +399,13 @@
399 ; These are default values that will be overriden by clients 399 ; These are default values that will be overriden by clients
400 ; 400 ;
401 ;resend_default = 12500 401 ;resend_default = 12500
402 ;land_default = 500 402 ;land_default = 1000
403 ;wind_default = 500 403 ;wind_default = 1000
404 ;cloud_default = 50 404 ;cloud_default = 1000
405 ;task_default = 500 405 ;task_default = 1000
406 ;texture_default = 500 406 ;texture_default = 1000
407 ;asset_default = 500 407 ;asset_default = 1000
408 ;state_default = 500 408 ;state_default = 1000
409 409
410 ; Per-client maximum burst rates in bytes per second for the various 410 ; Per-client maximum burst rates in bytes per second for the various
411 ; throttle categories. These are default values that will be overriden by 411 ; throttle categories. These are default values that will be overriden by
@@ -577,6 +577,9 @@
577 ; used to control llMove2Target 577 ; used to control llMove2Target
578 body_pid_derivative = 35 578 body_pid_derivative = 35
579 body_pid_gain = 25 579 body_pid_gain = 25
580
581 ; maximum number of contact points to generate per collision
582 contacts_per_collision = 80
580 583
581 ; amount of time a geom/body will try to cross a region border before it gets disabled 584 ; amount of time a geom/body will try to cross a region border before it gets disabled
582 geom_crossing_failures_before_outofbounds = 5 585 geom_crossing_failures_before_outofbounds = 5
@@ -937,6 +940,13 @@
937 940
938 ; Stack size per thread created 941 ; Stack size per thread created
939 ThreadStackSize = 262144 942 ThreadStackSize = 262144
943
944 ; Set this to true (the default) to load each script into a separate
945 ; AppDomain. Setting this to false will load all script assemblies into the
946 ; current AppDomain, which will reduce the per-script overhead at the
947 ; expense of reduced security and the inability to garbage collect the
948 ; script assemblies
949 AppDomainLoading = true
940 950
941 ; Rate to poll for asynchronous command replies (ms) 951 ; Rate to poll for asynchronous command replies (ms)
942 ; currently unused 952 ; currently unused
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
index 9571b1d..0106b56 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
+++ b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
Binary files differ
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
index c2627e8..be11bb4 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
+++ b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
Binary files differ
diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll
new file mode 100644
index 0000000..97729ff
--- /dev/null
+++ b/bin/openjpeg-dotnet-x86_64.dll
Binary files differ
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll
index 1cede1c..64b2557 100644
--- a/bin/openjpeg-dotnet.dll
+++ b/bin/openjpeg-dotnet.dll
Binary files differ