OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,278 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

779 Commits (cca01f5cdac9ee70f0795a5ea17a0cdc82b1d7bb)

Author SHA1 Message Date
Melanie 09c2cd0d76 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-05-24 00:45:08 +01:00
Justin Clark-Casey (justincc) 02fe05f346 Fix issue where llSetPayPrice on either one of a clone prim in the same OpenSimulator session would change the prices on both prims. 
This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
 2013-05-24 00:41:47 +01:00
Justin Clark-Casey (justincc) 7d38f4940c Implement llSetSoundQueueing(). 
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
 2013-05-22 20:01:57 +01:00
Melanie 231c298ca5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML
 2013-04-21 14:11:39 +01:00
dahlia 9ae24cac2f Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. 2013-04-19 00:35:06 -07:00
dahlia ce043c5141 Allow changes to TextureEntry to propagate to viewers when MaterialID changes 2013-04-17 22:41:12 -07:00
Melanie b16a560b77 Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster 2013-04-04 03:17:38 +01:00
Justin Clark-Casey (justincc) 7bf1986e91 Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched. 2013-04-03 00:24:33 +01:00
Justin Clark-Casey (justincc) 97f0c9da84 Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed. 2013-04-03 00:23:20 +01:00
Justin Clark-Casey (justincc) c0319daa40 fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched 2013-04-03 00:09:28 +01:00
Justin Clark-Casey (justincc) 3332af4060 minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes. 2013-04-03 00:01:06 +01:00
Melanie 4bc5a7aa19 Merge branch 'master' into careminster 2013-04-02 23:53:23 +01:00
Justin Clark-Casey (justincc) a3c723ee30 Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running 
No need to create new Vector3s since these are structs.
 2013-04-02 23:48:55 +01:00
Melanie c10331c8c2 Merge branch 'master' into careminster 2013-04-02 23:48:01 +01:00
Melanie 41a652f6bd Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-04-02 23:47:19 +01:00
Melanie 9b83e53b28 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet. 
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
 2013-03-31 21:59:44 +01:00
Melanie f142e1f394 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-03-31 20:27:46 +02:00
Melanie 4bf9c4bbb8 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet. 
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
 2013-03-31 20:25:32 +02:00
Melanie f2f8248178 Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-29 02:42:47 +00:00
Justin Clark-Casey (justincc) 23ae4c0a4d Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments. 
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal.
This is to resolve http://opensimulator.org/mantis/view.php?id=6578
 2013-03-29 02:21:38 +00:00
Melanie 5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-26 03:40:06 +00:00
Melanie c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
Melanie 8b657773e4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
 2013-03-14 22:34:15 +00:00
Justin Clark-Casey (justincc) 48d41ef307 Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this is being done lazily 2013-03-13 23:25:56 +00:00
Justin Clark-Casey (justincc) 5c53660a7f Add prototype dynamic objects map for scene object parts 
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes.
This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes.
This commit adds a DOExampleModule to demonstrate/evolve this code.
Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap.
DOExampleModule in this commit only attaches a fresh dynamic object.  Actually constructing this from stored dynamic attributes and handling persistence is left for later.
These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
 2013-03-13 22:59:06 +00:00
Melanie 1e7c7fb779 Merge branch 'master' into careminster 2013-03-11 19:09:49 +00:00
teravus 5097437e11 * Apparently, sometimes texture entries come in from the wire with no default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception. 2013-03-08 19:32:47 -05:00
teravus f954c53ddb * Separate two if trees that got merged into one if tree with borked logic. 2013-03-06 17:02:53 -05:00
Melanie ea8c5ba707 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-15 21:42:16 +00:00
Robert Adams 5920abbf8d Add EventManager events triggered when a SOP is added or removed 
from the physical scene. Invocations added in SceneObjectPart.
 2013-02-14 09:48:11 -08:00
Melanie 86ded35afa Merge branch 'master' into careminster 2013-02-07 23:35:30 +00:00
Melanie a2dad09172 Actually plumb the new values to physics. 2013-02-07 23:34:47 +00:00
Melanie 22675e6b14 Add some more code from Avination. This changes physics actor stuff around 
to work with the new params. Not actually plumbed just yet.
 2013-02-07 23:22:00 +00:00
Melanie 7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie 9089757ea2 Revert "Add plumbing for physics properties to get to the physics engine." 
This reverts commit c658fa1c0d.
 2013-02-07 21:05:58 +00:00
Robert Adams c658fa1c0d Add plumbing for physics properties to get to the physics engine. 
Addition of entries to PhysicsActor and setting code in SceneObjectPart.
 2013-02-07 11:10:15 -08:00
Melanie 6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie 6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Melanie e5beb480ea Partial port of Avination's support for the new physics parameters. 
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
 2013-02-06 08:03:04 +00:00
Melanie d8c27de395 Merge branch 'master' into careminster 2013-02-06 02:38:30 +00:00
Justin Clark-Casey (justincc) 2ce8a050e4 Remove very long unused IScriptHost and NullScriptHost 2013-02-06 02:15:54 +00:00
Melanie d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Oren Hurvitz af6a7cf95d Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs. 2013-01-25 04:03:26 +00:00
Justin Clark-Casey (justincc) a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it 
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
 2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc) 1bd0b06ec1 Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite 2013-01-25 04:03:04 +00:00
Melanie 0b8bf69470 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-01-25 00:10:32 +00:00
teravus 878df52515 * This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray. 2013-01-23 21:58:51 -05:00
Melanie 74e04c0f03 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2013-01-23 02:39:30 +00:00
Melanie cc4cfd9fa8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
 2013-01-23 02:38:59 +00:00
Robert Adams 95c53ecae7 Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter 
routines on the physics engine. Won't make a difference for any
existing scripts since ODE always returned Vector3.Zero.
 2013-01-21 15:55:54 -08:00
Melanie 2d3a57a002 Merge branch 'avination' 
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
 2013-01-19 21:49:33 +01:00
UbitUmarov de49440839 dont send a full grp update on stopmovetotarget. just a rootpart terse 2013-01-16 22:17:10 +00:00
Melanie fc5711fa7a Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-01-16 01:11:20 +00:00
Melanie b924e333b7 Merge branch 'avination' into careminster 2013-01-13 13:44:28 +00:00
Robert Adams daacd4deed Fix exception reporting in SceneObjectPart so it logs what the exception is rather than just saying it happened. 2013-01-11 16:47:07 -08:00
UbitUmarov d7f0bf04f6 update the last information sent in terse updates where they are sent to all 
clients and not only on Scheduled sends
 2013-01-11 16:24:48 +00:00
Melanie aecb32b74e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-01-10 01:25:07 +00:00
Melanie 949da1d4af Change IsRoot to use ReferenceEquals to prevent operator == messiness 2013-01-09 20:07:21 +01:00
Melanie e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc) 9503383887 Fix llGetLinkKey() to return the last sat avatar as the last link number. 
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
 2013-01-04 20:34:39 +00:00
Melanie 569f39e124 Merge branch 'master' into careminster 2012-12-21 22:13:41 +00:00
Robert Adams d15bfcf614 Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. 2012-12-18 19:25:40 -08:00
Melanie 0a876a305c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-12-16 21:19:30 +00:00
Justin Clark-Casey (justincc) 494e6a5f11 minor: If the physics module tells us that an object has gone out of bounds, more helpfully log the name, id, position and region of that object. 2012-12-15 00:30:17 +00:00
Justin Clark-Casey (justincc) 750ad2d3af Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, causing subsequent issues if physics was re-enabled. 
Added regression tests
Addresses http://opensimulator.org/mantis/view.php?id=6365
 2012-12-14 22:15:40 +00:00
Melanie dd416298f1 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-11-04 22:37:28 +00:00
Melanie 5328808b18 Make sure we're not accessing a physics scene if we're not in one yet. 2012-10-30 21:19:00 +01:00
Melanie d15d71a7ef Put back the collision sound shim into SOP 2012-10-30 01:28:03 +00:00
Melanie 48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv 5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
SignpostMarv af39af1cc4 fixing a bug in SceneObjectPart.SendSound where sounds would always come from the root prim rather than the source prim 2012-10-29 23:39:00 +00:00
SignpostMarv 57940087d1 Factoring out a superfluous local variable & repeated assignment in SceneObjectPart.SendSound as linksets are only meant to have a single owner 2012-10-29 23:38:59 +00:00
SignpostMarv 22693304fb removing superfluous lines from SceneObjectPart.SendSound 2012-10-29 23:38:59 +00:00
SignpostMarv a68e2fe169 transposing preload sound onto sound module 2012-10-29 23:38:58 +00:00
SignpostMarv 1c618843b8 formatting changes to SceneObjectPart.SendSound; consistent indentation 2012-10-29 23:38:58 +00:00
SignpostMarv 32db725dd7 SceneObjectPart.SendSound can exit early if a sound module was not found. 2012-10-29 23:38:58 +00:00
SignpostMarv f4fe8763ad Changing the logic order in the TaskInventory iterator of ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. 2012-10-29 23:38:58 +00:00
SignpostMarv b42cfe49a2 Replacing double-if block in SceneObjectPart.SendSound with Util.Clip 2012-10-29 23:38:57 +00:00
UbitUmarov 32171708c3 normalize quaternion.Slerp outputs 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-19 01:37:46 +01:00
Melanie a2c93133be Remove extraneous calls to the now commented CheckSculptAndLoad 2012-10-18 21:23:57 +01:00
UbitUmarov 7ab83f9eb2 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now

Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-18 21:13:02 +01:00
Melanie 72c925a6c9 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs
 2012-10-18 20:56:34 +01:00
Melanie 0ca9666932 Merge branch 'ubitwork' into avination 2012-10-17 20:46:38 +02:00
Melanie 416bc19da7 Merge branch 'avination' into careminster 2012-10-17 00:13:49 +01:00
Melanie aba078c93f Fix perms when linking an object. Set root part perms to the perms 
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
 2012-10-14 17:32:46 +02:00
Melanie 6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
UbitUmarov d554c0d574 normalize quaternion.Slerp outputs 2012-10-10 01:37:59 +01:00
Melanie 8894f4ad77 Change permissions on child prim inventory items when god mode "force 
permissive" is used.
 2012-10-08 01:34:32 +02:00
UbitUmarov 48d8fbc9ae bug fix + make costs visible for testing 2012-10-07 08:53:55 +01:00
UbitUmarov 78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now
 2012-10-07 01:20:52 +01:00
Dan Lake 91ca3117cb Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric 2012-10-05 17:32:07 -07:00
UbitUmarov 9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled 
for all physics engines)
 2012-10-03 23:14:56 +01:00
Melanie 001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
Justin Clark-Casey (justincc) 9eca154bce Make it possible to rescale SOGs when they are not in a scene. 2012-09-27 15:48:47 +01:00
Justin Clark-Casey (justincc) 2bf42f30af Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini. 
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.
 2012-09-27 00:12:34 +01:00
Justin Clark-Casey (justincc) b9934fc4db Don't store undo states if a scene object is manipulated when it is not in a scene. 
Adds regression test for this.
 2012-09-26 23:31:10 +01:00
Justin Clark-Casey (justincc) 31c636f1e4 refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. 2012-09-26 23:25:50 +01:00
Justin Clark-Casey (justincc) 36e3123069 Make it possible to rescale SOGs when they are not in a scene. 2012-09-26 23:17:21 +01:00
Justin Clark-Casey (justincc) 327320d1a7 Enforce existing 5 action hardcoded undo limit. 
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
 2012-09-26 22:49:44 +01:00
Justin Clark-Casey (justincc) 90dd5844d6 Add basic undo/redo regression tests. 2012-09-26 21:28:43 +01:00
Melanie a5d969d92f Comment out asset error for sculpts/meshes. If an asset is missing it's missing. 
We can't put it back so we don't need to know.
 2012-09-23 20:57:36 +02:00
Melanie 21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie fd92560649 Merge branch 'avination' into careminster 2012-08-31 00:34:22 +01:00
UbitUmarov a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is 
newgroup information avaiable.
 2012-08-30 01:30:56 +01:00
UbitUmarov c821153a4f [possible still bad] make use of keyframemotion.copy on sop.copy, replacing 
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.
 2012-08-30 00:15:46 +01:00
UbitUmarov ef6e007a4c [possible still very broken] mess around keyframes. timer events 
threads overlaps, some null objects exceptions, region crossing...
 2012-08-28 03:21:03 +01:00
Melanie c557684666 Fix bad child prim permissions that can make objects change perms after rezzing 
Port from Avination
 2012-08-24 00:15:30 +01:00
Melanie 7fca69222b Merge branch 'avination' into careminster 2012-08-24 00:07:56 +01:00
Melanie c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie f8603a215d Merge branch 'master' into careminster 
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
 2012-08-23 01:41:47 +01:00
SignpostMarv 481c00f50a refactoring out SetFaceColor 2012-08-20 23:10:25 +01:00
SignpostMarv ede3b9ab07 making use of implicit operators and Util.Clip handling of Vector3 2012-08-20 23:10:25 +01:00
SignpostMarv b863a15a82 single operation for PRIM_COLOR 2012-08-20 23:10:25 +01:00
SignpostMarv aee4353e9c fix typo 2012-08-20 23:10:25 +01:00
Melanie aee7a31bc3 Merge branch 'master' into careminster 
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
 2012-08-18 13:17:39 +01:00
SignpostMarv 7068fddd2f fixing bug that get/set the wrong property for prim types other than sphere & box 2012-08-17 23:23:03 +01:00
SignpostMarv 466d684fbe implemented 2012-08-17 23:23:03 +01:00
Robert Adams 57a9879669 Correct an exception report in SceneObjectPart so it outputs the stack. 2012-08-15 16:39:00 -07:00
SignpostMarv ef4122213c enables configurable minimum sizes for physical & non-physical prims 2012-08-15 23:35:23 +01:00
Melanie 0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
SignpostMarv cd9fd77e2c ImprovedTerseObjectUpdate packet does not support shape updates, thus scheduling terse updates will not (and does not) update shape information in the viewer 2012-08-03 01:55:46 +01:00
UbitUmarov d5f4fb7b50 Merge branch 'avination' into ubitwork 2012-07-17 00:54:23 +01:00
UbitUmarov 1dca94c72f don't subscribe collision events for nonphysical parts only because of 
collision sounds. Let them be passive
 2012-07-14 20:10:38 +01:00
Melanie d632fd7124 Merge branch 'master' into careminster 
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
 2012-07-12 08:55:16 +01:00
Robert Adams 743437262e Many explanitory comments added to the link and delink code in 
SOG and SOP. Should have no functionality changes.
 2012-07-11 16:12:38 -07:00
Melanie 906ac4adc4 Revert "Add instrumentation to log finalizer being called. Suppressed for backup" 
This reverts commit ea91a36483.
 2012-07-12 01:01:43 +02:00
Melanie ea91a36483 Add instrumentation to log finalizer being called. Suppressed for backup 
interim copies to avoid spammage. Not for release to the grid, must be
reverted first!
 2012-07-11 23:33:13 +02:00
Melanie 89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01:00
Melanie 0bc8238a6c Merge branch 'master' into careminster 
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
 2012-07-11 03:56:50 +01:00
Justin Clark-Casey (justincc) cdea572d2e refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar() 2012-07-10 23:50:04 +01:00
Justin Clark-Casey (justincc) 11e0ad6dc8 Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability" 
This reverts commit c8f0d476d2.
On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
 2012-07-10 23:39:05 +01:00
Justin Clark-Casey (justincc) c8f0d476d2 refactor: Add SOP.IsSitTargetOccupied to improve readability 2012-07-10 23:34:40 +01:00
Justin Clark-Casey (justincc) e8347b7095 Move common code to detect whether a part has a valid sit target into a SOP 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.
 2012-07-10 23:21:39 +01:00
Justin Clark-Casey (justincc) 58869e5aa0 Fix recent SOP.GetSittingAvatars() to return null if there are no sitting avatars rather than throwing an exception. 
Extends sitting avatar regression tests to test new sitters information
 2012-07-10 23:03:52 +01:00
UbitUmarov acec9da95c let SOP AngularVelocity set physics actor angular velocity if it's 
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
 2012-07-10 05:37:41 +01:00
UbitUmarov 652ac5f66b more work on llSetAngularVelocity() 2012-07-10 05:28:47 +01:00
Justin Clark-Casey (justincc) 2eaa6d5ace Do not allow a script to attach a prim if its being sat upon. 
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.
 2012-07-09 21:24:32 +01:00
Melanie 6535f23e4b Add saving vehicle physics data to the database 2012-07-07 02:05:01 +02:00
Melanie 26d89777d8 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-06 20:51:18 +01:00
UbitUmarov ce7864632b added llSetVelocity. will refuse to work on vehicles and on attachments ( this last may need fix) added also some code for llSetAngularVelocity but not working still 2012-07-06 17:13:11 +01:00
UbitUmarov c8f7cd60cd fix turning off phanton always decreasing number of physical parts 2012-06-21 19:05:36 +01:00
Melanie eab211f94d Merge branch 'master' into careminster 
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
 2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc) 714db90832 refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() instead of attachmentpoint magic numbers. 2012-06-20 22:46:01 +01:00
Justin Clark-Casey (justincc) e23d7ff9c0 minor: If logging because mesh/sculpt data isn't present for an object, log object UUID rather than local id, since UUID doesn't potentially vary between simulator starts. 2012-06-20 00:05:48 +01:00
UbitUmarov 5d32979170 Revert changes... 
This reverts commit c8227e1bb7.
 2012-06-15 14:31:35 +01:00
UbitUmarov 065cda3711 Add sop IsPhysical and IsPhantom to be used gradually in core in place of asking physics engines all the time. Some engines delays may make them give wrong answers. 2012-06-15 12:19:42 +01:00
Justin Clark-Casey (justincc) a4290048e5 Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment 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)
 2012-06-14 01:20:55 +01:00
Melanie 36117e079a Merge branch 'master' into careminster 2012-06-14 00:57:05 +01:00
Melanie c0b21d92c2 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-06 14:16:19 +01:00