diff options
| author | Robert Adams | 2013-10-28 09:30:26 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-28 09:30:26 -0700 |
| commit | 2be0347f5044ec723748c53db9290f3cf8bc431a (patch) | |
| tree | b52812ac7fcdcd8a7a985094e14ca3d461a39673 /bin | |
| parent | varregion: update PGSQL driver for storing variable terrain size blobs. (diff) | |
| parent | BulletSim: restore collision flags when clear collision cache. (diff) | |
| download | opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.zip opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.gz opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.bz2 opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.ini.example | 2 | ||||
| -rw-r--r-- | bin/lib/NET/Mono.Security.dll | bin | 0 -> 282624 bytes | |||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 1093632 -> 1094144 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.dylib | bin | 1181656 -> 1510988 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2332216 -> 2337209 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1230848 -> 1231360 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2522559 -> 2523676 bytes |
7 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 6a84574..0660de4 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -425,7 +425,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto | |||
| 425 | 425 | ||
| 426 | ; helper uri: optional: if it exists if will be used to tell the client to use | 426 | ; helper uri: optional: if it exists if will be used to tell the client to use |
| 427 | ; this for all economy related things | 427 | ; this for all economy related things |
| 428 | ;economy = http://127.0.0.1:9000/ | 428 | ;economy = http://127.0.0.1:8002/ |
| 429 | 429 | ||
| 430 | ; web page of grid: optional: page providing further information about your grid | 430 | ; web page of grid: optional: page providing further information about your grid |
| 431 | ;about = http://127.0.0.1/about/ | 431 | ;about = http://127.0.0.1/about/ |
diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll new file mode 100644 index 0000000..6accde7 --- /dev/null +++ b/bin/lib/NET/Mono.Security.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 7c16cb5..ee7cce7 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib index 02f8a7f..6efec3a 100755 --- a/bin/lib32/libBulletSim.dylib +++ b/bin/lib32/libBulletSim.dylib | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 3d2737b..ee2bd80 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 3afdf63..b4c4bec 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 6a17848..9c4033b 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||