aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
| | |
* | | Merge branch 'ubitwork' into avinationMelanie2012-07-174-51/+70
|\ \ \
| * | | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| | | | | | | | | | | | | | | | prims
| * | | fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| | | |
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ \
| * \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-172-16/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-1754-1302/+3004
| |\ \ \ \ \
| * | | | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| | | | | | |
| * | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive
* | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-0/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it.
* | | | | | Fix merge artefactsMelanie2012-07-173-10/+4
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-07-162-16/+0
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Revert "Fix script "Running" behavior"Melanie2012-07-162-16/+0
| | |/ | |/| | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | | Merge branch 'avination' into careminsterMelanie2012-07-163-4/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | missed fix on vehicle reference frameUbitUmarov2012-07-131-2/+1
| | |
| * | Revert "Add instrumentation to log finalizer being called. Suppressed for ↵Melanie2012-07-122-12/+6
| | | | | | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
| * | Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| | | | | | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6.
| * | Add "gc collect" console command for debugging memleaksMelanie2012-07-121-0/+7
| | |
| * | Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| | |
| * | Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-112-6/+12
| | | | | | | | | | | | | | | interim copies to avoid spammage. Not for release to the grid, must be reverted first!
| * | Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
| | | | | | | | | | | | up properly
* | | Merge branch 'master' into careminsterMelanie2012-07-132-7/+19
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Don't cache regions data on the other unused LocalGridServiceConnector that ↵Justin Clark-Casey (justincc)2012-07-131-5/+17
| | | | | | | | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
| * | Change very recent AllowedViewerList and BannedViewerList config setting ↵Justin Clark-Casey (justincc)2012-07-121-4/+4
| | | | | | | | | | | | | | | | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
* | | Merge branch 'master' into careminsterMelanie2012-07-124-26/+98
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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.
| * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-1/+5
| | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | | Merge branch 'avination' into careminsterMelanie2012-07-114-33/+119
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | Melanie fix: detach SOGs from backup on linkingUbitUmarov2012-07-111-0/+2
| | |
| * | 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-101-1/+28
| | |
| * | 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
| | |
| * | Add saving vehicle physics data to the databaseMelanie2012-07-073-25/+56
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-1110-96/+346
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| | |
| * | 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-104-7/+96
| | | | | | | | | | | | | | | | | | 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.
| * | 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-093-8/+122
| | | | | | | | | | | | | | | | | | 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.
| * | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-073-15/+3
| | | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
| * | Remove now duplicate interregion object check that should have been removed ↵Justin Clark-Casey (justincc)2012-07-061-12/+0
| | | | | | | | | | | | a few commits ago in 43a2da9
| * | Add assert to attachment regression tests to check that number of objects in ↵Justin Clark-Casey (justincc)2012-07-062-5/+24
| | | | | | | | | | | | the scene graph
| * | Mantis 6063 osNpcTouch.Talun2012-07-061-0/+8
| | | | | | | | | | | | Allow NPCS to touch obects.
generated by cgit v1.1 at 2024-12-21 00:35:05 +0000