aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ↵Dan Lake2012-10-051-2/+2
| | | | | | | | update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
| * Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-271-6/+6
| | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * Don't store undo states if a scene object is manipulated when it is not in a ↵Justin Clark-Casey (justincc)2012-09-261-3/+3
| | | | | | | | | | | | scene. Adds regression test for this.
| * refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| |
| * Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-261-8/+12
| |
| * Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-261-26/+33
| | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279
| * Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-261-6/+6
| |
| * Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-241-0/+21
| | | | | | | | Port from Avination
* | Merge branch 'avination' into careminsterMelanie2012-09-271-4/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| | | | | | | | | | | | We can't put it back so we don't need to know.
* | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-271-8/+12
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-2/+2
|\ \ \ | |/ /
| * | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-301-2/+2
| | | | | | | | | | | | newgroup information avaiable.
* | | Merge branch 'avination' into careminsterMelanie2012-08-311-1/+7
|\ \ \ | |/ /
| * | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-301-0/+3
| | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
| * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-1/+4
| | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...
* | | Merge branch 'avination' into careminsterMelanie2012-08-241-0/+21
|\ \ \ | |/ /
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-231-0/+21
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-231-13/+30
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactoring out SetFaceColorSignpostMarv2012-08-201-52/+15
| | |
| * | making use of implicit operators and Util.Clip handling of Vector3SignpostMarv2012-08-201-21/+26
| | |
| * | single operation for PRIM_COLORSignpostMarv2012-08-201-0/+49
| | |
| * | fix typoSignpostMarv2012-08-201-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-181-8/+58
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * fixing bug that get/set the wrong property for prim types other than sphere ↵SignpostMarv2012-08-171-1/+2
| | | | | | | | & box
| * implementedSignpostMarv2012-08-171-0/+50
| |
| * Correct an exception report in SceneObjectPart so it outputs the stack.Robert Adams2012-08-151-1/+1
| |
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-7/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
* | Merge branch 'avination' into ubitworkUbitUmarov2012-07-171-29/+171
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-07-121-8/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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-111-8/+20
| | | | | | | | | | | | SOG and SOP. Should have no functionality changes.
| * | Merge branch 'avination' into careminsterMelanie2012-07-111-22/+57
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-111-7/+122
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵Justin Clark-Casey (justincc)2012-07-101-0/+6
| | | | | | | | | | | | | | | | and SOP.RemoveSittingAvatar()
| | * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-101-6/+1
| | | | | | | | | | | | | | | | | | | | 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-101-1/+6
| | | |
| | * | Move common code to detect whether a part has a valid sit target into a SOP ↵Justin Clark-Casey (justincc)2012-07-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-101-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information
| | * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-091-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge branch 'avination' into careminsterMelanie2012-07-061-28/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-06-211-3/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | instead of attachmentpoint magic numbers.
| | * | | 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 'master' into careminsterMelanie2012-06-141-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'avination' into careminsterMelanie2012-06-061-7/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-16 13:19:20 +0000