aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/Ode.NET.dll.config2
-rw-r--r--bin/OpenMetaverse.dll.config2
-rw-r--r--bin/OpenSim.ini.example37
3 files changed, 26 insertions, 15 deletions
diff --git a/bin/Ode.NET.dll.config b/bin/Ode.NET.dll.config
index 58aad3f..f8f071e 100644
--- a/bin/Ode.NET.dll.config
+++ b/bin/Ode.NET.dll.config
@@ -2,4 +2,6 @@
2 <dllmap os="osx" dll="ode" target="libode.dylib" /> 2 <dllmap os="osx" dll="ode" target="libode.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" />
5 <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" />
6 <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" />
5</configuration> \ No newline at end of file 7</configuration> \ No newline at end of file
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 356b6a7..489ee6b 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -2,4 +2,6 @@
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" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" />
5 <dllmap os="!windows,osx" cpu="s390x" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-s390x" />
6 <dllmap os="!windows,osx" cpu="ppc64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-ppc64" />
5</configuration> 7</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bd03652..ff8fa5f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1271,21 +1271,28 @@
1271 ; The PHP code for the server is available from the Flotsam project for you to deploy 1271 ; The PHP code for the server is available from the Flotsam project for you to deploy
1272 ; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/ 1272 ; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/
1273 ; 1273 ;
1274 ;Module = XmlRpcGroups 1274 ;Module = GroupsModule
1275 1275
1276 ;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php 1276 ; Enable Group Notices
1277 ;XmlRpcServiceReadKey = 1234 1277 ;NoticesEnabled = true
1278 ;XmlRpcServiceWriteKey = 1234 1278
1279 1279 ; This makes the Groups modules very chatty on the console.
1280 ;XmlRpcMessagingEnabled = true 1280 ;DebugEnabled = true
1281 ;XmlRpcNoticesEnabled = true 1281
1282 1282 ; Specify which messaging module to use for groups messaging and if it's enabled
1283 ; This makes the XmlRpcGroups modules very chatty on the console. 1283 ;MessagingModule = GroupsMessagingModule
1284 ;XmlRpcDebugEnabled = true 1284 ;MessagingEnabled = true
1285 1285
1286 ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for 1286 ; Service connector to Groups Service [Select One]
1287 ; a problem discovered on some Windows based region servers. Only disable 1287 ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
1288 ; if you see a large number (dozens) of the following Exceptions: 1288 ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
1289 ;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php
1290 ;XmlRpcServiceReadKey = 1234
1291 ;XmlRpcServiceWriteKey = 1234
1292
1293 ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
1294 ; this is a work around fora problem discovered on some Windows based region servers.
1295 ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
1289 ; System.Net.WebException: The request was aborted: The request was canceled. 1296 ; System.Net.WebException: The request was aborted: The request was canceled.
1290 ; 1297 ;
1291 ; XmlRpcDisableKeepAlive = false 1298 ; XmlRpcDisableKeepAlive = false