diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Tools | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to 'OpenSim/Tools')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs index 701881e..66a336a 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | |||
| @@ -47,6 +47,9 @@ namespace pCampBot | |||
| 47 | { | 47 | { |
| 48 | Dictionary<UUID, Primitive> objects = Bot.Objects; | 48 | Dictionary<UUID, Primitive> objects = Bot.Objects; |
| 49 | 49 | ||
| 50 | if (objects.Count <= 0) | ||
| 51 | return; | ||
| 52 | |||
| 50 | Primitive prim = objects.ElementAt(Bot.Random.Next(0, objects.Count - 1)).Value; | 53 | Primitive prim = objects.ElementAt(Bot.Random.Next(0, objects.Count - 1)).Value; |
| 51 | 54 | ||
| 52 | // This appears to be a typical message sent when a viewer user clicks a clickable object | 55 | // This appears to be a typical message sent when a viewer user clicks a clickable object |