diff options
| author | Melanie | 2012-08-01 23:03:03 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 23:03:03 +0100 |
| commit | ecffcf7f65151a45b6396354d66fec70a7f3bad8 (patch) | |
| tree | c2b98c522344cf713421b21ddb4452e537396f5a /OpenSim/Tools/pCampBot | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.zip opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.gz opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.bz2 opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Tools/pCampBot')
| -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 |