aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-09-0121-296/+938
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profiles: Clean up some log entries caused when visiting HG avatar is using ↵BlueWall2013-08-291-16/+26
| | | | | | | | legacy profiles
| * Initialization: move key expansion out to operate on all sources and not ↵BlueWall2013-08-291-2/+2
| | | | | | | | just environment variables
| * Do not add a port zero to end of the hypergrid gateway host name.Robert Adams2013-08-281-1/+4
| | | | | | | | | | | | If the port is specified it is added but a ":0" is not added if the port is zero. This enables the hypergrid address short form "hypergridGateway:regionName" which is handled by the parser but failed because of this zero port addition.
| * BulletSim: add some protections for processing when shutting down.Robert Adams2013-08-271-2/+2
| | | | | | | | Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740).
| * Revert "Make HG logins fall back to fallback regions if the desired region ↵Justin Clark-Casey (justincc)2013-08-261-24/+3
| | | | | | | | | | | | | | | | fails." This is very similar to my earlier revert in bcb8605f8428a9009a2badf9c9eed06d9f59962c and fails for the same reasons. Reverting this change because it causes a problem if access is denied to the user. This reverts commit c7a8afbb8da40e09252d58d95c89b8a99a684157.
| * Revert "Added some more debug messages."Justin Clark-Casey (justincc)2013-08-261-4/+1
| | | | | | | | | | | | | | | | Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer Reverting because this introduces a bug when access does fail. More detail in revert of main commit. This reverts commit ec32c1d4b69e4219fe44a38bcbc411e7996641f1.
| * Fix exception thrown after a region has been restarted through scheduling.Justin Clark-Casey (justincc)2013-08-251-10/+22
| | | | | | | | | | This exception was very likely harmless since it occurred after the restart had taken place, but still misleading. Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747, though I did this in a slightly different way.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-253-5/+29
| |\
| | * Added some more debug messages.Diva Canto2013-08-241-1/+4
| | |
| | * Potential fix for access control bug on login introduced with SeeIntoRegion ↵Diva Canto2013-08-241-1/+1
| | | | | | | | | | | | commit.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-2411-84/+128
| | |\
| | | * Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
| | | | | | | | | | | | | | | | printed the error message and not the call stack.
| | * | Make HG logins fall back to fallback regions if the desired region fails.Diva Canto2013-08-241-3/+24
| | | |
| * | | Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with ↵Justin Clark-Casey (justincc)2013-08-231-1/+1
| | |/ | |/| | | | | | | other capitalizations of pCampBot
| * | minor: shortern warning messages in EntityTransferModule when UpdateAgent() ↵Justin Clark-Casey (justincc)2013-08-231-4/+4
| | | | | | | | | | | | fails
| * | Make pCampbot "show bot" command take the bot number instead of the full bot ↵Justin Clark-Casey (justincc)2013-08-231-4/+9
| | | | | | | | | | | | | | | | | | name Shorter and can do this because bot names are uniform
| * | remove redundant return at end of HandleDeregisterRegion()Justin Clark-Casey (justincc)2013-08-231-2/+0
| | |
| * | Make it possible for the "deregister region id" command to accept more than ↵Justin Clark-Casey (justincc)2013-08-231-24/+27
| | | | | | | | | | | | one id
| * | Remove old and unused ScenePresence.RestoreInCurrentScene()Justin Clark-Casey (justincc)2013-08-231-5/+0
| | |
| * | 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
| |\
| * | Show number of connections each bot has established in "show bots" command.Justin Clark-Casey (justincc)2013-08-192-8/+24
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-181-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.
generated by cgit v1.1 at 2024-12-22 14:27:31 +0000