aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-07 23:09:47 +0000
committerJustin Clark-Casey (justincc)2013-02-07 23:09:47 +0000
commit9e17dc3daa04644c1a565d819a614c02022bdeed (patch)
tree014eb8cec88c68b2dedde009a508dde3b5b52aca /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
parentFix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff)
parentPlumb the path from the client to the extra physics params and back (diff)
downloadopensim-SC-9e17dc3daa04644c1a565d819a614c02022bdeed.zip
opensim-SC-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz
opensim-SC-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2
opensim-SC-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 4d2c0f2..3cc3950 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -807,5 +807,13 @@ namespace OpenSim.Region.ClientStack.Linden
807 { 807 {
808 return EventQueueHelper.BuildEvent(eventName, eventBody); 808 return EventQueueHelper.BuildEvent(eventName, eventBody);
809 } 809 }
810
811 public void partPhysicsProperties(uint localID, byte physhapetype,
812 float density, float friction, float bounce, float gravmod,UUID avatarID)
813 {
814 OSD item = EventQueueHelper.partPhysicsProperties(localID, physhapetype,
815 density, friction, bounce, gravmod);
816 Enqueue(item, avatarID);
817 }
810 } 818 }
811} 819}