diff options
| author | Melanie | 2012-06-09 16:28:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-09 16:28:22 +0100 |
| commit | 8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch) | |
| tree | b9e133efe376878064c12b83a4e6d5eef62ceb4e /OpenSim/Tools | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff) | |
| download | opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Tools')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index b6cd287..daaa3c0 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
| @@ -480,6 +480,9 @@ namespace pCampBot | |||
| 480 | 480 | ||
| 481 | public void Objects_NewPrim(object sender, PrimEventArgs args) | 481 | public void Objects_NewPrim(object sender, PrimEventArgs args) |
| 482 | { | 482 | { |
| 483 | // if (Name.EndsWith("4")) | ||
| 484 | // throw new Exception("Aaargh"); | ||
| 485 | |||
| 483 | Primitive prim = args.Prim; | 486 | Primitive prim = args.Prim; |
| 484 | 487 | ||
| 485 | if (prim != null) | 488 | if (prim != null) |