diff options
| author | Melanie | 2013-11-08 17:55:01 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-08 17:55:01 +0000 |
| commit | 91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch) | |
| tree | 3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2 opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 24576 -> 20480 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.dll | bin | 1785856 -> 1794048 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverseTypes.dll | bin | 114688 -> 110592 bytes | |||
| -rw-r--r-- | bin/Robust.ini.example | 2 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 992768 -> 1094144 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2332216 -> 2337209 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1231872 -> 1231360 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2522559 -> 2523676 bytes |
9 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 100916c..e63593e 100755 --- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll +++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index bb16ed0..d6a3247 100755 --- a/bin/OpenMetaverse.StructuredData.dll +++ b/bin/OpenMetaverse.StructuredData.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 59e8083..3d89548 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 7ee907b..213555c 100755 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
| Binary files differ | |||
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/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 187d150..ee7cce7 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index e60bdd3..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 e8738e1..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 ef3eb3a..9c4033b 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||