aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-103-5/+83
| | | | | | | | | | | | | | | | | | 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
| * | Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ↵Justin Clark-Casey (justincc)2012-07-061-14/+27
| | | | | | | | | | | | | | | | | | Scene.AddObject() Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks
* | | Merge branch 'avination' into careminsterMelanie2012-07-064-45/+84
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | added llSetVelocity. will refuse to work on vehicles and on attachments ( ↵UbitUmarov2012-07-061-0/+28
| | | | | | | | | | | | this last may need fix) added also some code for llSetAngularVelocity but not working still
| * | Merge branch 'ubitwork' into avinationMelanie2012-06-284-45/+56
| |\ \
| | * | fix a seg fault in sp.csUbitUmarov2012-06-251-1/+2
| | | |
| | * | fix turning off phanton always decreasing number of physical partsUbitUmarov2012-06-211-28/+28
| | | |
| | * | fix SceneGraph Add/Remove PhysicalPrim countersUbitUmarov2012-06-211-2/+2
| | | |
| | * | *CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out ↵UbitUmarov2012-06-172-14/+24
| | | | | | | | | | | | | | | | SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
* | | | Merge branch 'master' into careminsterMelanie2012-07-058-33/+122
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-055-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high.
| * | | Correct spelling mistake m_BanedViewers to m_BannedViewersJustin Clark-Casey (justincc)2012-07-031-4/+4
| | | |
| * | | minor: Add some method doc to HasGroupChanged and Schedule ↵Justin Clark-Casey (justincc)2012-07-031-2/+21
| | | | | | | | | | | | | | | | GroupForFull/PartUpdate() to indicate when region modules need to invoke them
| * | | Fix issue in database tests where sogs being stored are not in a scene.Justin Clark-Casey (justincc)2012-07-031-1/+1
| | | | | | | | | | | | | | | | This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
| * | | Adds a list of viewers that are allowed or banned from the region.Michelle Argus2012-07-021-0/+65
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-1/+35
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-07-011-38/+0
|\ \ \ \ | |/ / /
| * | | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-22/+0
| | | | | | | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
| * | | Remove code listed for removal in 0.7.3 that handled script restart for ↵Justin Clark-Casey (justincc)2012-06-301-16/+0
| | | | | | | | | | | | | | | | incoming attachments from pre-fatpack regions (versions of OpenSimulator more than a year old)
* | | | Merge branch 'master' into careminsterMelanie2012-06-292-29/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used ↵Justin Clark-Casey (justincc)2012-06-292-30/+32
| | | | | | | | | | | | | | | | in many, many log messages.
* | | | 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-281-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-281-37/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-271-37/+4
| | | | | | | | | | | | AttachmentsModule.
* | | Merge branch 'master' into careminsterMelanie2012-06-265-14/+41
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-252-14/+13
| | | | | | | | | | | | | | | | | | 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-231-0/+14
| | | | | | | | | | | | 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-216-64/+103
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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-203-59/+90
| | | | | | | | | | | | | | | | | | 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