diff options
| author | Diva Canto | 2012-09-20 15:51:27 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-20 15:51:27 -0700 |
| commit | 33aa6d172f29a8d34ae1d1f75e506b2e5eb681d7 (patch) | |
| tree | 55a191ba66b585e7cb1531257e4326529779702f /bin | |
| parent | More HG2.0: Added permission policies in HGAsset Service based on asset types... (diff) | |
| parent | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ... (diff) | |
| download | opensim-SC-33aa6d172f29a8d34ae1d1f75e506b2e5eb681d7.zip opensim-SC-33aa6d172f29a8d34ae1d1f75e506b2e5eb681d7.tar.gz opensim-SC-33aa6d172f29a8d34ae1d1f75e506b2e5eb681d7.tar.bz2 opensim-SC-33aa6d172f29a8d34ae1d1f75e506b2e5eb681d7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 | ||||
| -rwxr-xr-x | bin/lib32/libopenjpeg-dotnet.so | bin | 124540 -> 140028 bytes | |||
| -rwxr-xr-x | bin/lib64/libopenjpeg-dotnet-x86_64.so | bin | 142616 -> 149368 bytes | |||
| -rwxr-xr-x | bin/lib64/libopenjpeg-dotnet.dylib | bin | 125136 -> 147288 bytes | |||
| -rwxr-xr-x | bin/openjpeg-dotnet-x86_64.dll | bin | 843776 -> 215040 bytes | |||
| -rwxr-xr-x | bin/openjpeg-dotnet.dll | bin | 187392 -> 201216 bytes |
6 files changed, 1 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ef4f578..315ffbe 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -673,8 +673,7 @@ | |||
| 673 | ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. | 673 | ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. |
| 674 | ; This may help with some situations where avatars are persistently grey, though it will not help | 674 | ; This may help with some situations where avatars are persistently grey, though it will not help |
| 675 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). | 675 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). |
| 676 | ; This setting is experimental. | 676 | ResendAppearanceUpdates = true |
| 677 | ResendAppearanceUpdates = false | ||
| 678 | 677 | ||
| 679 | 678 | ||
| 680 | [Attachments] | 679 | [Attachments] |
diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so index 0106b56..193eca4 100755 --- a/bin/lib32/libopenjpeg-dotnet.so +++ b/bin/lib32/libopenjpeg-dotnet.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so index be11bb4..7a9bdfc 100755 --- a/bin/lib64/libopenjpeg-dotnet-x86_64.so +++ b/bin/lib64/libopenjpeg-dotnet-x86_64.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib index dc50775..18ca868 100755 --- a/bin/lib64/libopenjpeg-dotnet.dylib +++ b/bin/lib64/libopenjpeg-dotnet.dylib | |||
| Binary files differ | |||
diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll index 97729ff..9e8cd21 100755 --- a/bin/openjpeg-dotnet-x86_64.dll +++ b/bin/openjpeg-dotnet-x86_64.dll | |||
| Binary files differ | |||
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll index 64b2557..6377b8d 100755 --- a/bin/openjpeg-dotnet.dll +++ b/bin/openjpeg-dotnet.dll | |||
| Binary files differ | |||