ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,059 Commits 5 Branches 88 Tags
ff21007b93cfea55f6b66bb08d0ab0810fcc77b5
Commit Graph

498 Commits

Author SHA1 Message Date
Melanie
ff21007b93 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-15 15:48:34 +01:00
Melanie
36117e079a Merge branch 'master' into careminster 2012-06-14 00:57:05 +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
UbitUmarov
cd49949478 change object drag so it applies a impulse and not a push force so it works as before my fix to impulse/forces 2012-06-11 22:43:35 +01:00
Melanie
69dd5b855a Merge branch 'avination' into careminster 2012-06-07 23:34:22 +01:00
Melanie
f5cbe56c56 Make not_at_target stop when the target is reached even if the script 
is not listening to at_target
 2012-06-07 19:01:33 +02:00
Melanie
78e657fd8d Merge branch 'avination' into careminster 2012-05-27 19:35:36 +01:00
Melanie
d69f197a5d Fix setting positions of attachments. The recent security fix regarding 
prim entry messed it up.
 2012-05-19 12:35:07 +02:00
Melanie
e7819ce909 Port Avination's collision fixes to core. 2012-05-15 01:02:38 +01:00
Melanie
71115c32ad Merge branch 'avination' into careminster 2012-05-14 23:33:16 +01:00
Melanie
e3c376156c Completely revamp collision handling. Now works as it is supposed to. 2012-05-14 22:45:54 +02:00
Melanie
e78043cb70 Check parcel entry permissions when moving objects 2012-05-14 01:32:22 +02:00
Melanie
df7abbb367 Merge branch 'master' into careminster 2012-05-07 12:07:47 +01:00
Melanie
1120a2cf36 Merge branch 'avination' into careminster 2012-05-07 12:07:42 +01:00
Melanie
b60f51dafc Stop llSetPos from sending one update per child prim 2012-05-06 19:21:54 +01:00
UbitUmarov
e3226aecd9 SOG: tell physics about when we want a force or a impulse. (sorry add to change here also) 2012-05-05 10:47:51 +01:00
Melanie
b62cc3ce0a Merge branch 'avination' into careminster 2012-05-05 10:32:22 +01:00
UbitUmarov
58a1a0710c SOG copy bug fix, now new group has own empty list of sitted avatars. Also changed crossing code to restore sitting avas in case of group cross fail 2012-05-04 11:32:37 +01:00
Melanie
8b1cc0dd29 Merge branch 'avination' 2012-05-03 00:15:45 +02:00
UbitUmarov
a135e51d23 Improved sitted avatars crossings ( plus tests on vehicles) 2012-05-02 22:08:09 +01:00
Melanie
58d460542d Merge branch 'avination' 2012-05-02 00:33:56 +02:00
Melanie
82197c87a2 Merge branch 'ubitwork' into avination 2012-05-02 00:33:37 +02:00
Melanie
e6e12c2d42 Merge branch 'avination' 2012-05-02 00:32:28 +02:00
Melanie
fc3cf2b5a3 Fix saving of attachment positions 2012-05-01 23:21:28 +02:00
UbitUmarov
84b5b3e89b llGetGeometricCenter... 2012-04-29 06:39:09 +01:00
UbitUmarov
c7c0d5558b remove repeated set of group rotation to physics 2012-04-29 01:00:46 +01:00
UbitUmarov
df9935273f SOG bug fix in group rotations updates 2012-04-29 00:41:51 +01:00
Melanie
174fa4a70f Merge branch 'avination' 2012-04-29 01:33:40 +02:00
UbitUmarov
dd745f60c2 fix llGetCenterOfMass ( checked with ubitODE only) 2012-04-28 21:36:38 +01:00
Melanie
db31c9fe58 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-25 19:15:40 +01:00
Melanie
88553bb884 Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990 2012-04-25 19:09:22 +01:00
UbitUmarov
22ea2ef9a0 set PIDHoverTau and not PIDTau since all physics need that 2012-04-25 17:11:32 +01:00
UbitUmarov
816a44d6da SOG bug fix in UI object changes 2012-04-24 21:48:12 +01:00
Melanie
159b3b27ca Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-23 21:13:08 +01:00
Melanie
e903709847 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-04-23 20:44:41 +01:00
Melanie
8df4bd14f5 Merge branch 'master' into careminster 2012-04-22 15:06:06 +01:00
Justin Clark-Casey (justincc)
9ac48b2aff Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object. 
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
 2012-04-21 01:43:09 +01:00
UbitUmarov
3b56c44453 changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects 2012-04-20 18:51:32 +01:00
Melanie
65b3e13010 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-20 00:17:14 +01:00
Melanie
fc9f244a7d Merge branch 'master' into careminster 2012-04-18 00:28:33 +01:00
Justin Clark-Casey (justincc)
859646ef5c minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions. 2012-04-17 23:54:51 +01:00
Melanie
0fe0b2ceec Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death) 2012-04-17 23:39:41 +02:00
Melanie
5e3a76361f Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-13 03:03:44 +01:00
Melanie
fe65b51876 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-13 03:00:48 +01:00
Talun
08e509978d Mantis 55025 Implement script time. 
Signed-off-by: nebadon <michael@osgrid.org>
 2012-04-12 18:44:00 -07:00
UbitUmarov
c4a9eae961 make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine. 2012-04-09 23:33:42 +01:00
Melanie
67d4f1d66c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IScriptModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-09 21:40:03 +01:00
Talun
78c0028179 Mantis5502 implementation of some of the new constants 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-04-09 21:25:22 +01:00
Melanie
b39de2425c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-07 04:52:14 +01:00
Justin Clark-Casey (justincc)
cce760dbfc Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead. 
This reduces pointless memory usage.
 2012-04-07 00:40:55 +01:00