aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-220-0/+0
|\
| * Following on from 476a7d3e (which wasn't enough), make chat across regions ↵Justin Clark-Casey (justincc)2013-03-221-56/+31
| | | | | | | | | | | | on different simulators work. Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
* | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \ | |/
| * Take out a testing sleep I accidentally left in the teleport code from last ↵Justin Clark-Casey (justincc)2013-03-221-2/+0
| | | | | | | | commit 7471bc7
| * At strategic points in the teleport process, if the client has ↵Justin Clark-Casey (justincc)2013-03-222-10/+69
| | | | | | | | | | | | | | simultaneously logged out then do not continue. This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response). This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
* | Merge branch 'master' into careminsterMelanie2013-03-2224-144/+597
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Implement chat across region borders since we can tell if avatars in ↵Justin Clark-Casey (justincc)2013-03-221-1/+1
| | | | | | | | neighbouring regions are in range.
| * minor: On teleport, signal a child agent before we send the viewer ↵Justin Clark-Casey (justincc)2013-03-211-5/+5
| | | | | | | | | | | | | | | | TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour. If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root. This closes the original presence which we don't really want to do. This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
| * On a teleport, lock m_agentsInTransit whilst we grab the value to check for ↵Justin Clark-Casey (justincc)2013-03-212-5/+12
| | | | | | | | completion just to be sure we're not using a thread cached version.
| * minor: disable logging on regression TestCrossOnSameSimulator() that I ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | | | | | accidentally left on a few commits ago.
| * minor: don't bother with the pause before rezzing attachments if we are ↵Justin Clark-Casey (justincc)2013-03-201-1/+15
| | | | | | | | | | | | running regression tests (fire and forget calls launched on the same thread). Also adds code comments as to why this pause exists.
| * Add file missing from last commit 36651beJustin Clark-Casey (justincc)2013-03-201-0/+91
| |
| * On the later forms of teleport failure, tell the user if this was because ↵Justin Clark-Casey (justincc)2013-03-206-71/+185
| | | | | | | | | | | | | | viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion. Also adds regression test for the case where the viewer couldn't connect with the destination region. Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
| * Insert a short delay on the simulator side rezzing of attachments in order ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions. This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar. This doesn't affect version 1 viewers since this delay is shorter than the login delay. This doesn't increase the login time since this part of the process was already being performed asynchronously. This may be a temporary solution.
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 ↵Justin Clark-Casey (justincc)2013-03-201-10/+7
| | | | | | | | | | | | 21:38:00 2013) This break was not connected with the recent attachment code changes.
| * Force a viewer object update for attachments at the end of the final ↵Justin Clark-Casey (justincc)2013-03-201-0/+9
| | | | | | | | | | | | | | Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region. For some reason, sending updates before this will not have this effect. This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-201-1/+1
| |\
| | * BulletSim: change 'degenerate mesh' message from Error to Debug because thereRobert Adams2013-03-191-1/+1
| | | | | | | | | | | | | | | seem to be lots of sculpties with this problem while the condition really doesn't change region operation.
| * | Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-193-34/+60
| |/ | | | | | | | | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
| * For the moment, disable the output of the 'scene' statistics in ↵Robert Adams2013-03-191-1/+3
| | | | | | | | | | | | | | SimExtraStatsCollector and thus for the command 'show stats' because it is ugly and most of the information is already output in the formatted printout that appears before.
| * For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| | | | | | | | | | around the world, change LogWriter to use DateTime.UtcNow rather than DateTime.Now.
| * BulletSim: code to generate a higher resolution terrain mesh. ParameterRobert Adams2013-03-194-18/+189
| | | | | | | | | | TerrainMeshMagnification controls number of vertices generated per heightmap point. Default is 3.
| * BulletSim: add terrain contact processing threshold parameter. Initialize ↵Robert Adams2013-03-194-1/+23
| | | | | | | | contact processing threshold for static object as well as mesh terrain.
* | Merge branch 'avination' into careminsterMelanie2013-03-192-12/+37
|\ \
| * | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ↵teravus2013-03-161-11/+36
| | | | | | | | | | | | SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters.
| * | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵root2013-03-161-2/+2
| |\ \ | | | | | | | | | | | | avination
| * | | Fix case where the string member of a LSL_String in a list is nullroot2013-03-161-1/+1
| | | |
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-03-190-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | careminster
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-03-1729-8909/+157
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-150-0/+0
| |\ \ \ \ \
* | | | | | | Fix merge artefactsMelanie2013-03-192-6/+6
| | | | | | |
* | | | | | | Merge branch 'master' into careminsterMelanie2013-03-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Process default attachment point in AttachObjectInternal before we check ↵Justin Clark-Casey (justincc)2013-03-191-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
| * | | | | | Fix tests for multiattachMelanie2013-03-182-6/+6
| | | | | | |
| * | | | | | Merge branch 'master' into newmultiattachMelanie2013-03-1888-9613/+2109
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * \ \ \ \ \ \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | | | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| | | | | | | | |
| * | | | | | | | Multiattach, part 2Melanie2013-03-181-3/+9
| | | | | | | | |
| * | | | | | | | Multiattach, part 1Melanie2013-03-187-39/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | | | | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
| * | | | | | | | Fix recent regression where an item worn to an attachment point that was ↵Justin Clark-Casey (justincc)2013-03-182-89/+153
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case.
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-03-1729-8909/+157
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Make the LSL memory functions virtual so script engines can override them if ↵Melanie2013-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they have different memory management.
* | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-1929-8909/+157
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | BulletSim: add INI parameter for angular banking timescale fudge parameter.Robert Adams2013-03-162-7/+12
| | | | | | |
| * | | | | | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL ↵Vegaslon2013-03-161-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * | | | | | *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-164-3/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
| * | | | | | Finally remove the 'REST' ApplicationPlugins code which has been ↵Justin Clark-Casey (justincc)2013-03-1523-8890/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | non-functional and largely commented out for many years.
* | | | | | Merge branch 'master' into careminsterMelanie2013-03-1525-339/+474
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-11-10 05:00:35 +0000