aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Refactor: merge SceneGraph.AddScenePresence() into ↵Justin Clark-Casey (justincc)2013-08-231-28/+6
| | | | | | CreateAndAddChildScenePresence() since the former was only ever called from the latter This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
* minor: Correct typo on "debug stats record start" messageJustin Clark-Casey (justincc)2013-08-231-1/+1
|
* minor: remove mono compiler warning from LLClientViewJustin Clark-Casey (justincc)2013-08-231-4/+0
|
* Fix a further bug in pCampbot connect where ignoring already connected bots ↵Justin Clark-Casey (justincc)2013-08-221-6/+14
| | | | | | was wrongly counted as a connect Also, only sleep when we actually perform a connection
* Make it possible to adjust the pCampbot login delay via the [BotManager] ↵Justin Clark-Casey (justincc)2013-08-221-0/+7
| | | | LoginDelay parameter of pCampbot.ini
* Add "set bots" command to make it possible to set SEND_AGENT_UPDATES on all ↵Justin Clark-Casey (justincc)2013-08-221-0/+27
| | | | bots whilst pCampbot is running
* Stop "handle sit user name" command from trying to sit avatars on objects ↵Justin Clark-Casey (justincc)2013-08-221-0/+3
| | | | which have sit positions but are attachments
* Stop error messages being misleadingly generated when on client connection ↵Justin Clark-Casey (justincc)2013-08-221-2/+19
| | | | | | activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity. Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
* In pCampbot, don't try and reconnect bots that are already connected on ↵Justin Clark-Casey (justincc)2013-08-221-1/+2
| | | | console "connect" command
* Stop "sit user name" and "stand user name" console commands from trying to ↵Justin Clark-Casey (justincc)2013-08-221-2/+8
| | | | sit/stand avatars already sitting/standing
* minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so ↵Justin Clark-Casey (justincc)2013-08-221-4/+8
| | | | that we can distinguish between simultaneous logins
* Revert "Implement ability for hg logins to try fallback regions just like ↵Justin Clark-Casey (justincc)2013-08-221-39/+5
| | | | | | | | | | | local logins." This approach does not work - it is taking place too far down the login process where really the region checking could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol change to pass the agentID as well as the requested regionID) This reverts commit 3d9b73c47a15cf00150ac80570fea88de8cecbdf.
* Implement ability for hg logins to try fallback regions just like local logins.Justin Clark-Casey (justincc)2013-08-211-5/+39
| | | | | These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text. Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
* Don't allow users to attempt to sit on objects in a child region without ↵Justin Clark-Casey (justincc)2013-08-212-0/+29
| | | | | | | going to that region first. If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid. Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
* * Fix some threading issues in BulletXNA (the managed bullet library), this ↵teravus2013-08-202-3/+48
| | | | | | should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs. * Fixed a null ref during shutdown.
* Fix build break from last commit a3e1b27 on mono 2.4.3Justin Clark-Casey (justincc)2013-08-201-1/+1
| | | | Looks like this level of mono doesn't have a string.Join() which will take a list rather than an array (or some implicit conversion isn't happening)
* Add pCampbot "show bot" console command to show more detailed information on ↵Justin Clark-Casey (justincc)2013-08-202-2/+58
| | | | a particular bot (e.g. what sims they are connected to)
* Add --regex options to "sit user name" and "stand user name" console ↵Justin Clark-Casey (justincc)2013-08-201-50/+81
| | | | | | | commands to sit/stand many avatars at once. Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex. So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
* Add experimental "sit user name" and "stand user name" console commands in ↵Justin Clark-Casey (justincc)2013-08-201-0/+180
| | | | | | | SitStandCommandsModule. "sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon. Chiefly for debug purposes.
* Add pCampbot console commands to sit all bots on ground and stand all botsJustin Clark-Casey (justincc)2013-08-202-47/+51
|
* Add -connect (-c) switch to pCampbot command line options.Justin Clark-Casey (justincc)2013-08-201-10/+15
| | | | | Now, bots will only connect at startup if this switch is specified. If it is not specified, then a separate "connect" command is required on the pCampbot command line
* Make it possible to reconnect pCampbots with the console command "connect ↵Justin Clark-Casey (justincc)2013-08-193-80/+155
| | | | | | [<n>]". If no n is given then all available bots are connected
* refactor: start bot connection thread within BotManager rather than externallyJustin Clark-Casey (justincc)2013-08-192-5/+27
|
* refactor: restructure pCampbot multi-bot connection code.Justin Clark-Casey (justincc)2013-08-191-10/+60
|
* Make it possible to disconnected a specified number of bots via the pCampbot ↵Justin Clark-Casey (justincc)2013-08-192-48/+82
| | | | | | | console command "disconnect [<n>]" Bots disconnected are ascending from last in numeric order. Temporarily no way to reconnect bots.
* Create a separate pCampbot "disconnect" console command which disconnects ↵Justin Clark-Casey (justincc)2013-08-191-43/+67
| | | | | | | | connected bots. "quit" console command now requires bots to be separate disconnected first before quitting. This is to prepare the way for disconnecting/reconnecting different numbers of bots in a pCampbot session. And hopefully resolves bug where console appears not to be reset if Environment.Exit(0) is called on a different thread
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-191-4/+16
|\
| * Allow updating the wearable type of wearables that have a type of 0.Melanie2013-08-181-4/+16
| | | | | | | | This will allow viewers to fix broken wearables as they detect them.
* | Show number of connections each bot has established in "show bots" command.Justin Clark-Casey (justincc)2013-08-192-8/+24
|/
* Remove mono compiler warnings from UserProfilesModuleJustin Clark-Casey (justincc)2013-08-171-19/+16
|
* minor: remove mono compiler warning from AttachmentsModuleJustin Clark-Casey (justincc)2013-08-171-2/+1
|
* Remove some mono compiler warnings from OpenSim/Server/HandlersJustin Clark-Casey (justincc)2013-08-173-10/+4
|
* minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGridJustin Clark-Casey (justincc)2013-08-172-9/+2
|
* minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
|
* remove mono compiler warnings from PollServiceRequestManagerJustin Clark-Casey (justincc)2013-08-171-4/+2
|
* minor: remove mono compiler warning in StatsManagerJustin Clark-Casey (justincc)2013-08-171-1/+1
|
* minor: Make log messages consistent in NeighbourServicesConnectorJustin Clark-Casey (justincc)2013-08-171-6/+6
|
* Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap ↵Justin Clark-Casey (justincc)2013-08-171-15/+30
| | | | | | | | | not working. This is because they were wrongly looking for both regionid and region_id parameters in the same request. Now only region_id is required (and recognized), regionid having been already deprecated for some time. This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces. Thanks!
* Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() ↵Justin Clark-Casey (justincc)2013-08-175-10/+109
| | | | | | regression test for v2 transfers. Also adjusts names of teleport setup helpers in EntityTransferHelpers
* Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity ↵Justin Clark-Casey (justincc)2013-08-161-2/+87
| | | | transfer protocl
* refactor: Make ↵Justin Clark-Casey (justincc)2013-08-161-1/+1
| | | | AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
* Packet headers are not zero-encoded so don't try to zero-decode these in ↵Justin Clark-Casey (justincc)2013-08-161-16/+9
| | | | | | | | PacketPool.GetType() Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211) Thanks to lkalif for pointing this out.
* Try to make "slow down" message that one could receive on rapid teleporting ↵Justin Clark-Casey (justincc)2013-08-151-1/+2
| | | | | | | | more informative to the user. This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs. The solution here is for the user to wait a short while. This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously. Probably still useful here to help identify misbehaving scripts.
* Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a ↵Justin Clark-Casey (justincc)2013-08-151-2/+6
| | | | low probability where the destination re-establishing the child connection before the flag was reset
* Rely on the Scene.IncomingCloseAgent() check as to whether the connection ↵Justin Clark-Casey (justincc)2013-08-152-15/+7
| | | | | | should be kept open after teleport-end rather than doing this in the ET Module This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
* Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-152-23/+32
| | | | | | | This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity. In this case, the DoNotCloseAfterTeleport was wrongly set. The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur Hence, this code now closes child agents as the first action after a sucessful teleport.
* Actually implement the bot request object textures switch started in 225cf0d.Justin Clark-Casey (justincc)2013-08-142-0/+9
| | | | Forgot to propogate it down to bot level.
* minor: Comment out AvatarPicketSearch caps log message for now, which is ↵Justin Clark-Casey (justincc)2013-08-141-1/+1
| | | | occuring on every login and entity transfer
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-145-6/+28
|\
| * BulletSim: include check for volume detect in check for zeroing avatar motion.Robert Adams2013-08-142-2/+6
| | | | | | | | | | | | | | Normally, avatar motion is zeroed if colliding with a stationary object so they don't slide down hills and such. Without volume detect check this also allowed avatars to stand on volume detect objects and to have some jiggling when they were in the volume detect object. This commit fixes both.