aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorlbsa712007-09-27 13:25:45 +0000
committerlbsa712007-09-27 13:25:45 +0000
commit8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch)
treeae67873a5f801b2b7bdf9a7b088db98beb97b5ac /bin
parentTerrain: (diff)
downloadopensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip
opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz
opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2
opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini16
-rw-r--r--bin/libsecondlife.dllbin1415168 -> 1515520 bytes
-rw-r--r--bin/libsecondlife.dll.config4
3 files changed, 10 insertions, 10 deletions
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index f4efeb5..a6cc18b 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -1,5 +1,5 @@
1[Startup] 1[Startup]
2gridmode = false 2gridmode = true
3physics = basicphysics 3physics = basicphysics
4; Prim Storage 4; Prim Storage
5; if you would like to use sqlite uncomment the following line (and 5; if you would like to use sqlite uncomment the following line (and
@@ -28,13 +28,13 @@ default_location_y = 1000
28http_listener_port = 9000 28http_listener_port = 9000
29remoting_listener_port = 8895 29remoting_listener_port = 8895
30 30
31grid_server_url = "http://127.0.0.1:8001" 31grid_server_url = "http://osgrid.org:8001/"
32grid_send_key = "null" 32grid_send_key = "1234"
33grid_recv_key = "null" 33grid_recv_key = "1234"
34 34
35user_server_url = "http://127.0.0.1:8002" 35user_server_url = "http://osgrid.org:8002/"
36user_send_key = "null" 36user_send_key = "1234"
37user_recv_key = "null" 37user_recv_key = "1234"
38 38
39asset_server_url = "http://127.0.0.1:8003" 39asset_server_url = "http://osgrid.org:8003/"
40 40
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index 8b9596d..b9741bc 100644
--- a/bin/libsecondlife.dll
+++ b/bin/libsecondlife.dll
Binary files differ
diff --git a/bin/libsecondlife.dll.config b/bin/libsecondlife.dll.config
index d8f6677..cc35d6e 100644
--- a/bin/libsecondlife.dll.config
+++ b/bin/libsecondlife.dll.config
@@ -1,5 +1,5 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0.dylib" /> 2 <dllmap os="osx" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-libsl.dll" target="./libopenjpeg-libsl-2.1.2.0-x86_64.so" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0-x86_64.so" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-libsl.dll" target="./libopenjpeg-libsl-2.1.2.0.so" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0.so" />
5</configuration> 5</configuration>