aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | If RegionReady is active, don't falsely say that logins are enabled in the ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | | | | | | | | | | | main scene loop before RegionReady is signalled when initial script compilation finishes. Also raises this logging level to Info from Debug since this information is of high importance. This matches the behaviour of the RegionReady module
| * | minor: If logging because mesh/sculpt data isn't present for an object, log ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
* | | Merge branch 'avination' into careminsterMelanie2012-06-152-2/+9
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Revert changes...UbitUmarov2012-06-151-21/+3
| | | | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1.
| * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of ↵UbitUmarov2012-06-151-3/+21
| | | | | | | | | | | | asking physics engines all the time. Some engines delays may make them give wrong answers.
| * | Changed t adding the avatar dependent sit offset and not subtracting, so ↵UbitUmarov2012-06-131-2/+4
| | | | | | | | | | | | not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
| * | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵UbitUmarov2012-06-131-1/+2
| | | | | | | | | | | | Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
| * | Moved auxiliar funtions of last commit from sop to lsl api since they are ↵UbitUmarov2012-06-121-34/+0
| | | | | | | | | | | | only used on one place each
| * | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵UbitUmarov2012-06-121-0/+34
| | | | | | | | | | | | code in SOP.cs
| * | change object drag so it applies a impulse and not a push force so it works ↵UbitUmarov2012-06-111-2/+6
| | | | | | | | | | | | as before my fix to impulse/forces
* | | Merge branch 'master' into careminsterMelanie2012-06-142-2/+19
|\ \ \ | | |/ | |/|
| * | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-142-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center)
* | | Merge branch 'master' into careminsterMelanie2012-06-122-5/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
| * | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵Justin Clark-Casey (justincc)2012-06-121-4/+3
| | | | | | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
* | | Merge branch 'master' into careminsterMelanie2012-06-111-6/+6
|\ \ \ | |/ /
| * | Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-114-4/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Fix a corner case where checking for region corssing may cross an avatar back ifMelanie2012-06-081-2/+7
| | | | | | | | | | | | it's pending to be sat onto a vehicle that is in the process of crossing.
| * | Revert "Add a frame based watchdog function to keyframed motion"Melanie2012-06-081-20/+0
| | | | | | | | | | | | This reverts commit 2d98d6354ce04b655e8d9062a209f5af1565c78c.
| * | Merge branch 'ubitwork' into avinationMelanie2012-06-081-0/+20
| |\ \
| | * | Add a frame based watchdog function to keyframed motionMelanie2012-06-081-0/+20
| | | |
| * | | Cut off collision sounds with avatar at 3.2. This makes most walkig collisionsMelanie2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | with walls and stairs silent. Falls from greater height and running into things will still be heard. a CollisionSound defined for the object will override this so one can still script a soccer ball with sounds.
| * | | Further limit the amount of avatar collisions that will actually triggerMelanie2012-06-071-2/+4
| | | | | | | | | | | | | | | | sounds. They are distracting.
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-072-0/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-06-083-83/+75
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-083-81/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ETM.DoTeleport() if an agent needs closing. This is always done as part of Scene.RemoveClient() Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
* | | | Merge branch 'master' into careminsterMelanie2012-06-083-16/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Go back to calling IncomingCloseAgent() in the "kick user" command for ↵Justin Clark-Casey (justincc)2012-06-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | consistency instead of IClientAPI.Close() directly. This no longer double counts child agent removals
| * | | Remove duplicate update of user count in Scene.IncomingCloseAgent()Justin Clark-Casey (justincc)2012-06-083-14/+27
| | | | | | | | | | | | | | | | This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
* | | | Merge branch 'master' into careminsterMelanie2012-06-082-22/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | | Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-082-20/+22
| | | | | | | | | | | | | | | | | | | | This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close() DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
* | | | Merge branch 'avination' into careminsterMelanie2012-06-073-89/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-133/+57
| | | | | | | | | | | | | | | | | | | | collisions to make them really soft because otherwise climbing stairs makes an unbearable amount of noise.
| * | | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| | | | | | | | | | | | | | | | is not listening to at_target
| * | | Disable default collision sounds until they can be uploaded, but enable ↵Melanie2012-06-071-55/+56
| | | | | | | | | | | | | | | | custom ones
| * | | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-071-0/+1
| | |/ | |/| | | | | | | it altogether. Allow a maximum of three uses before the restart goes through.
* | | Merge branch 'master' into careminsterMelanie2012-06-072-40/+38
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-072-23/+18
| | | | | | | | | | | | Also change code to grab the agent asset transaction module once.
| * | Don't send kill object messages to clients when a child agent is closed.Justin Clark-Casey (justincc)2012-06-071-18/+21
| | |
* | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-064-10/+19
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| | |
| * | Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| | |
| * | Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| | |
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-042-2/+2
| | | | | | | | | | | | positions.
* | | Merge branch 'master' into careminsterMelanie2012-06-063-151/+159
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| | | | | | | | | | | | | | | This makes frame time stats properly tally with fps, which saves confusion and makes it easier to interpret numbers. In some ways this is not so artifical - physics FPS runs at the higher rate.
| * | Start sending spare frame time MS viewer stat. Make frame time correctly ↵Justin Clark-Casey (justincc)2012-06-052-78/+124
| | | | | | | | | | | | | | | | | | | | | display total frame time, not just non-spare time. This makes it easier to see when components of frame time exceed normal permitted frame time. Currently reflect scene frame times.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-051-1/+1
| |\ \
generated by cgit v1.1 at 2025-01-09 11:25:12 +0000