diff options
| author | Melanie | 2013-08-17 03:23:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-17 03:23:45 +0100 |
| commit | bef03fb30be67dbe671dcc330558daf8a6c4bb22 (patch) | |
| tree | 6d221db8af5bdb1a09190527a79aae3dfe3116d9 /OpenSim/Tools/pCampBot/BotManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to 'OpenSim/Tools/pCampBot/BotManager.cs')
| -rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 397a98e..dee02c3 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
| @@ -300,6 +300,7 @@ namespace pCampBot | |||
| 300 | Bot pb = new Bot(bm, behaviours, firstName, lastName, password, startLocation, loginUri); | 300 | Bot pb = new Bot(bm, behaviours, firstName, lastName, password, startLocation, loginUri); |
| 301 | pb.wear = wearSetting; | 301 | pb.wear = wearSetting; |
| 302 | pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates; | 302 | pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates; |
| 303 | pb.RequestObjectTextures = InitBotRequestObjectTextures; | ||
| 303 | 304 | ||
| 304 | pb.OnConnected += handlebotEvent; | 305 | pb.OnConnected += handlebotEvent; |
| 305 | pb.OnDisconnected += handlebotEvent; | 306 | pb.OnDisconnected += handlebotEvent; |