diff options
| author | Melanie | 2012-08-01 22:39:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 22:39:40 +0100 |
| commit | e36bc0d754af2b165d736e89fc2aef4f96c823b8 (patch) | |
| tree | 68e85efa0167fd5bf84a9c9bf1287673d0168016 /OpenSim | |
| parent | Create the ability for physics modules to request assets on demand by (diff) | |
| parent | Fix a bug in pCampbot grabbing behaviour where an exception would be thrown i... (diff) | |
| download | opensim-SC-e36bc0d754af2b165d736e89fc2aef4f96c823b8.zip opensim-SC-e36bc0d754af2b165d736e89fc2aef4f96c823b8.tar.gz opensim-SC-e36bc0d754af2b165d736e89fc2aef4f96c823b8.tar.bz2 opensim-SC-e36bc0d754af2b165d736e89fc2aef4f96c823b8.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
| -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 |