aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-1220-104/+303
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Many explanitory comments added to the link and delink code inRobert Adams2012-07-112-23/+93
| | | | | | | | SOG and SOP. Should have no functionality changes.
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-1111-40/+22
| | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
| * Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-113-3/+12
| | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
| * Remove WorldComm module from the regression TestCompileAndStartScript() ↵Justin Clark-Casey (justincc)2012-07-111-4/+1
| | | | | | | | since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-117-31/+149
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
| * Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-111-1/+26
| | | | | | | | currently only checks for the presence of script items, not for started scripts
* | Merge branch 'avination' into careminsterMelanie2012-07-1114-388/+677
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | remove expensive and leaked ( in Xengine at least) SayShout timer andUbitUmarov2012-07-111-5/+23
| | | | | | | | | | | | | | | replace it by a simpler function that should do the same (?) (don't like much those 10 + 1 bursts)
| * | ubitODE leaksUbitUmarov2012-07-113-25/+33
| | |
| * | Melanie fix: detach SOGs from backup on linkingUbitUmarov2012-07-111-0/+2
| | |
| * | console region restart: Let Xengine not cry all over the place withUbitUmarov2012-07-101-6/+10
| | | | | | | | | | | | errors also. May not be that good, but is not in use in AVN (i hope). Still safer to do a full shutdown and refire the region from a OS tool like a script, monit, etc etc
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-101-5/+7
| |\ \
| | * | Reinstate parallel fetching of residents and remove a left over return from ↵Melanie2012-07-081-5/+7
| | | | | | | | | | | | | | | | debugging
| * | | lltargetomega efective spinrate now multiplied by gain ( need check )UbitUmarov2012-07-101-0/+1
| | | |
| * | | let SOP AngularVelocity set physics actor angular velocity if it'sUbitUmarov2012-07-101-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | physical root prim and not a vehicle. With this llSetAngularVelocity should work and also llTargetOmega will do the same in this case. but for now this llTargetOmega is being a normal physical rotation with damping, and stops with selection. Thats not like SL apparently
| * | | more work on llSetAngularVelocity()UbitUmarov2012-07-102-4/+29
| | | |
| * | | let rotationVelocity or AngularVelocity be setted on prims. Limited toUbitUmarov2012-07-101-19/+46
| | | | | | | | | | | | | | | | 12rad/s
| * | | retry fixing ode getconfiguration()UbitUmarov2012-07-091-1/+8
| | | |
| * | | fix ode getconfigurationUbitUmarov2012-07-092-2/+2
| | | |
| * | | log ODE lib configurationUbitUmarov2012-07-091-3/+7
| | | |
| * | | fix ODE dispose plus minor clean. On regions restart ode.dispose seemsUbitUmarov2012-07-091-15/+43
| |/ / | | | | | | | | | | | | to be called with scene still calling simulation, that should be changed, for now added a check for a valid world in ode simulation
| * | Revamp map block sending to eliminate overload of the grid server connectionMelanie2012-07-082-98/+204
| | | | | | | | | | | | and the sim's http client
| * | Instead of sending 20 records in 2 packets, send just one as we intended in ↵Melanie2012-07-081-1/+1
| | | | | | | | | | | | the first place.
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-082-261/+257
| | |
| * | Change semantics of FromXML on vehicle data to make the serializer a bit cleanerMelanie2012-07-072-7/+19
| | |
| * | fix vehicle to XML stringUbitUmarov2012-07-071-7/+13
| | |
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-073-25/+56
| |\ \
| | * | Add saving vehicle physics data to the databaseMelanie2012-07-073-25/+56
| | | |
| * | | ODE turn off material dependent friction while vehicle linear motor is ↵UbitUmarov2012-07-073-5/+9
| |/ / | | | | | | | | | Effective. Increase a bit world damping of velocities
* | | Merge branch 'master' into careminsterMelanie2012-07-1129-280/+781
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | If a part has a sit target and an avatar is already sitting, allow another ↵Justin Clark-Casey (justincc)2012-07-101-7/+4
| | | | | | | | | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid.
| * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵Justin Clark-Casey (justincc)2012-07-102-5/+6
| | | | | | | | | | | | and SOP.RemoveSittingAvatar()
| * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-8/+3
| | | | | | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
| * | refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
| | |
| * | refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵Justin Clark-Casey (justincc)2012-07-101-4/+2
| | | | | | | | | | | | | | | | | | rather than creating a new copy There are no issues with side-effects since this is a struct.
| * | Move common code to detect whether a part has a valid sit target into a SOP ↵Justin Clark-Casey (justincc)2012-07-102-30/+20
| | | | | | | | | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
| * | Remove log line accidentally left in SP.SendSitResponse()Justin Clark-Casey (justincc)2012-07-101-1/+1
| | |
| * | Disable logging in regression test in OSSL_ApiAttachmentTestsJustin Clark-Casey (justincc)2012-07-101-1/+1
| | |
| * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-102-6/+32
| | | | | | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information
| * | When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-105-13/+110
| | | | | | | | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
| * | If a script is being stopped manually, then give the scriptpool thread 1 ↵Justin Clark-Casey (justincc)2012-07-101-1/+5
| | | | | | | | | | | | | | | | | | | | | second to finish normally before forcibly aborting. This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks. This very short grace period is identical to the existing behaviour when a script is removed from the scene.
| * | This script allows an object to be attached directly from prim inventory to ↵Justin Clark-Casey (justincc)2012-07-094-5/+96
| | | | | | | | | | | | | | | | | | | | | another avatar in the scene. Very useful in serious game/environment scenarios where its only allowed for trusted creators. Threat level Severe
| * | Don't allow a prim to be sat upon if its part of an attachmentJustin Clark-Casey (justincc)2012-07-091-0/+9
| | |
| * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-095-9/+162
| | | | | | | | | | | | | | | | | | This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory.
| * | minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init ↵Justin Clark-Casey (justincc)2012-07-071-3/+2
| | | | | | | | | | | | is only complete for a particular region at a time
| * | minor: remove some recent mono compiler warningsJustin Clark-Casey (justincc)2012-07-071-1/+1
| | |
| * | Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xmlJustin Clark-Casey (justincc)2012-07-071-1/+0
| | | | | | | | | | | | | | | This was causing 2 copies of the module to be created for each scene. Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded)
| * | minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
| | |
| * | minor: Get RegionReady module to shout initialization complete status to ↵Justin Clark-Casey (justincc)2012-07-071-1/+3
| | | | | | | | | | | | draw the eye