aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'avination' into careminsterMelanie2012-06-291-2/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | | Fix llRegionSayTo the right wayMelanie2012-06-281-2/+9
| | |/ | |/|
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-282-24/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-283-37/+24
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-273-37/+24
| | | | | | | | | | | | AttachmentsModule.
* | | Merge branch 'master' into careminsterMelanie2012-06-267-17/+51
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | When attachments are being saved and deleted for a closing root agent, ↵Justin Clark-Casey (justincc)2012-06-253-17/+21
| | | | | | | | | | | | | | | | | | delete first to avoid a hud race condition with update threads. If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
| * | In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove ↵Justin Clark-Casey (justincc)2012-06-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | attachment before changing properties for correct inventory serialization. Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position. However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers. This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property). LLClientView then screens out any deleted SOGs before sending updates to viewers.
| * | Fix script "Running" behaviorBlueWall2012-06-232-0/+16
| | | | | | | | | | | | Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
| * | Fix bug where attachments would not retain position if just rotated and not ↵Justin Clark-Casey (justincc)2012-06-221-0/+5
| | | | | | | | | | | | | | | | | | moved. This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
* | | Merge branch 'master' into careminsterMelanie2012-06-217-67/+119
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | | | | | instead of magic numbers
| * | refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | | | | | instead of attachmentpoint magic numbers.
| * | Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-204-62/+106
| | | | | | | | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
| * | 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
generated by cgit v1.1 at 2024-12-21 11:18:19 +0000