aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-149-84/+257
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-2/+29
| |
| * minor: add explanative comment to 'missing baked texture' logging commonly ↵Justin Clark-Casey (justincc)2012-05-141-0/+10
| | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
| * minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| |
| * Set the agent in transit teleport flag at the first available opportunity ↵Justin Clark-Casey (justincc)2012-05-141-11/+37
| | | | | | | | | | | | | | | | | | | | (i.e. when IsInTransit() was being checked) to close down a race condition. On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts. However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check. This has been seen in the field and the results aren't pretty. This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window. More failure cases are made to to call ResetInTransit() to adjust to this move.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-144-64/+172
| |\
| | * Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵Chris Koeritz2012-05-132-26/+26
| | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
| |/
* | Merge branch 'avination' into careminsterMelanie2012-05-139-29/+125
|\ \
| * | ubitODE fix force in case of mlinear motor offset presentUbitUmarov2012-05-131-4/+5
| | |
| * | display a sleep time of zero if forced spare time to zero, when sim fps is ↵UbitUmarov2012-05-121-2/+7
| | | | | | | | | | | | lower than desired, for better display coerence.
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-125-3/+49
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-124-0/+96
| |\ \
| * | | ubitODE let vehicles responde faster to changes of some parameters like ↵UbitUmarov2012-05-121-12/+13
| | | | | | | | | | | | | | | | motors decay times
| * | | ubitODE reduced again a bit the max allowed correction velocity on ↵UbitUmarov2012-05-121-1/+1
| | | | | | | | | | | | | | | | colisions, to reduce a bit bouncing inerent to colisions.
| * | | ubitODE: trial workaround for avatar colisionsUbitUmarov2012-05-121-6/+49
| | | |
| * | | revert terminal vel reduction. It helped but not efectiveUbitUmarov2012-05-111-2/+2
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
|\ \ \ \ | | |/ / | |/| |
| * | | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-114-0/+96
| |/ / | | | | | | | | | Details in the lsl wiki
| * | reduce avatars terminal velocity to less than 30m/s or colisions with basic ↵UbitUmarov2012-05-102-6/+9
| | | | | | | | | | | | boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt).
| * | ubitode: changes to vehicles servosUbitUmarov2012-05-101-100/+154
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-134-7/+229
|\ \ \ | | |/ | |/|
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-29/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-2/+29
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-8/+26
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-103-7/+34
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-1010-20/+128
| | |\ \
| | * | | Add even for terrain tainting and synchronize terrain module with physics ↵Dan Lake2012-05-103-7/+34
| | | | | | | | | | | | | | | | | | | | scene before physics simulation step rather than after
| * | | | Add "attachments" show console command that will show the server's record of ↵Justin Clark-Casey (justincc)2012-05-101-0/+177
| | |/ / | |/| | | | | | | | | | | | | | | | | | which attachments an in-scene avatar has. For debugging purposes.
* | | | Merge branch 'master' into careminsterMelanie2012-05-102-7/+10
|\ \ \ \ | |/ / /
| * | | Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-102-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completely rewritten every time a region starts up. This makes the data write only when the data was not already read from the database. There is a still a major race condition whenever two regions share the same estate data, but at least it won't be triggered on startup.
* | | | Merge branch 'master' into careminsterMelanie2012-05-107-6/+109
|\ \ \ \ | |/ / /
| * | | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-093-6/+13
| | | | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
| * | | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-094-0/+96
| | | | | | | | | | | | | | | | Details in the lsl wiki
* | | | Merge branch 'master' into careminsterMelanie2012-05-0916-239/+346
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | | Remove physics actor related race conditions in SetVehicleFlags() and ↵Justin Clark-Casey (justincc)2012-05-091-7/+9
| |/ / | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\ \
| | * | Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports.
| * | | Trigger event when scene presences are updatedDan Lake2012-05-082-0/+34
| |/ /
| * | Add automated TestllBreakLink()Justin Clark-Casey (justincc)2012-05-081-0/+27
| | |
| * | Add automated TestllCreateLink()Justin Clark-Casey (justincc)2012-05-081-0/+112
| | |
| * | refactor: Eliminate local id parameter from api initialize.Justin Clark-Casey (justincc)2012-05-0810-46/+36
| | | | | | | | | | | | This is always available from m_host.LocalId
| * | Instead of constantly looking up unchanging self item in script code, pass ↵Justin Clark-Casey (justincc)2012-05-0810-190/+145
| | | | | | | | | | | | in self item on initialization.
| * | Perform SceneGraph.DuplicateObject() under existing m_updateLock already ↵Justin Clark-Casey (justincc)2012-05-081-75/+89
| | | | | | | | | | | | | | | | | | | | | used for link and delinking, in order to avoid race conditions. DuplicateObject() relies on source object having correct link numbers for the duration of the dupe. Both link and delink can change link numbers such that they are not consistent for short periods of time.
* | | Merge branch 'master' into careminsterMelanie2012-05-082-28/+19
|\ \ \ | |/ /
| * | Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| | | | | | | | | | | | | | | | | | This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8. Yet again I accidentally committed something whilst evaluating it.
| * | Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
| | |
| * | For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and ↵Justin Clark-Casey (justincc)2012-05-071-8/+10
| | | | | | | | | | | | | | | | | | osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo] [GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
| * | refactor: Instead of performing a ScenePresence lookup twice over ↵Justin Clark-Casey (justincc)2012-05-071-18/+2
| | | | | | | | | | | | LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()