aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | 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-012-2/+38
| | | |
* | | | 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-294-32/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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.
| * | | Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-282-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
generated by cgit v1.1 at 2024-12-21 07:48:56 +0000