diff options
| author | Melanie | 2013-09-01 22:49:31 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-01 22:49:31 +0100 |
| commit | 008c98a9748ba7deadb80c435ddd372002b6c844 (patch) | |
| tree | 9458b87c1d28d741ee6c2384eb1028375cb703ab /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Profiles: Clean up some log entries caused when visiting HG avatar is using l... (diff) | |
| download | opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.zip opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.gz opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.bz2 opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/BulletXNA.dll | bin | 610304 -> 618496 bytes | |||
| -rw-r--r-- | bin/BulletXNA.pdb | bin | 1963520 -> 1889792 bytes | |||
| -rw-r--r-- | bin/data/LICENSE-README-IMPORTANT.txt | 2 | ||||
| -rw-r--r-- | bin/pCampBot.ini.example (renamed from bin/pCampbot.ini.example) | 4 |
4 files changed, 5 insertions, 1 deletions
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll index bfaac4f..b3ddc32 100644 --- a/bin/BulletXNA.dll +++ b/bin/BulletXNA.dll | |||
| Binary files differ | |||
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb index ecab22f..ed3baad 100644 --- a/bin/BulletXNA.pdb +++ b/bin/BulletXNA.pdb | |||
| Binary files differ | |||
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt index a1ac20c..dd8671d 100644 --- a/bin/data/LICENSE-README-IMPORTANT.txt +++ b/bin/data/LICENSE-README-IMPORTANT.txt | |||
| @@ -2,4 +2,4 @@ Not all of the files in this directory are licensed under the BSD license. Some | |||
| 2 | 2 | ||
| 3 | These files are: | 3 | These files are: |
| 4 | 4 | ||
| 5 | - avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) | 5 | - avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) |
diff --git a/bin/pCampbot.ini.example b/bin/pCampBot.ini.example index f44feae..2952bb0 100644 --- a/bin/pCampbot.ini.example +++ b/bin/pCampBot.ini.example | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | ; This is the example config file for pCampbot | 1 | ; This is the example config file for pCampbot |
| 2 | ; To use it, copy this file to pCampbot.ini and change settings if required | 2 | ; To use it, copy this file to pCampbot.ini and change settings if required |
| 3 | 3 | ||
| 4 | [BotManager] | ||
| 5 | ; Number of milliseconds to wait between bot logins | ||
| 6 | LoginDelay = 5000 | ||
| 7 | |||
| 4 | [Bot] | 8 | [Bot] |
| 5 | ; Control whether bots should regularly send agent updates | 9 | ; Control whether bots should regularly send agent updates |
| 6 | ; Not doing this will reduce CPU requirements for pCampbot but greatly | 10 | ; Not doing this will reduce CPU requirements for pCampbot but greatly |