Commit Graph

19559 Commits (174fa4a70f2622c65ef8d9488765b71c1fad345e)

Author SHA1 Message Date
Melanie 174fa4a70f Merge branch 'avination' 2012-04-29 01:33:40 +02: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
UbitUmarov dd745f60c2 fix llGetCenterOfMass ( checked with ubitODE only) 2012-04-28 21:36:38 +01:00
UbitUmarov e48fa38ff5 Oooops don't hover underground but do hover 2012-04-27 23:18:54 +01:00
UbitUmarov f5cb403e7e reorder priority of vehicle hover flags 2012-04-27 22:59:57 +01:00
Melanie dcbcbd697f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
BlueWall db566fbb09 Fix prebuild.xml
adding a reference to a dll requires 'path="..."'
2012-04-27 16:17:46 -04:00
Oren Hurvitz 6473674bbf Fixed: custom walking animations didn't stop when the avatar stopped walking.
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.

This reverts commit feef1dd732.
2012-04-27 20:47:02 +01:00
Oren Hurvitz 9622e8ac72 If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region. 2012-04-27 20:22:35 +01:00
Oren Hurvitz 37d770f814 Use DotNetZip to compress OARs and IARs.
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
Justin Clark-Casey (justincc) 9d1791def8 Add Stefan_Boom / stoehr to contributors 2012-04-27 19:42:12 +01:00
Justin Clark-Casey (justincc) e39e4f6bfb minor: style adjustments in SensorRepeat, mainly related to patch from stoehr 2012-04-27 19:40:19 +01:00
Stefan_Boom b35a1d5681 Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim. 2012-04-27 19:31:50 +01:00
Diva Canto 9bc94c502a MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid 2012-04-27 11:05:40 -07:00
Diva Canto a9dbe39319 MapImage security issue. Compare strings instead of IPAddresses. 2012-04-27 10:39:20 -07:00
Diva Canto 292752bb78 MapImage security issue: better error messages 2012-04-27 10:22:43 -07:00
Diva Canto ac64fe03d8 Amend to last commit: account for the existence of proxies. 2012-04-27 09:59:46 -07:00
Diva Canto 2970a18e54 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-27 09:26:14 -07:00
Diva Canto c84f63f4dc Minor change in error message (HG teleport failures) 2012-04-27 09:24:50 -07:00
Diva Canto e4e754ee93 MapImageService: added an additional security check for OSGrid and other grids like it. 2012-04-27 09:23:56 -07:00
Melanie 90305001de Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
UbitUmarov ee237fc5df test 2012-04-27 12:19:22 +01:00
UbitUmarov 8ef7df5a56 test 2012-04-27 11:01:34 +01:00
UbitUmarov 2006188ee5 test 2012-04-27 10:49:32 +01:00
UbitUmarov 2419de2b6d test 2012-04-27 10:10:31 +01:00
UbitUmarov fedc9eb105 itest 2012-04-27 09:50:53 +01:00
UbitUmarov 1c735facee test 2012-04-27 09:23:20 +01:00
UbitUmarov cadbfcc011 itest 2012-04-27 09:15:31 +01:00
UbitUmarov b948826b7e test 2012-04-27 09:09:29 +01:00
UbitUmarov 7a7f4b7722 testing 2012-04-27 09:00:30 +01:00
UbitUmarov 03450dee39 testing.... 2012-04-27 08:11:18 +01:00
UbitUmarov 6edbbdc83a ubitODE fix don't report colisions with a volume detector ( only report to it ) 2012-04-27 06:00:50 +01:00
UbitUmarov e974d493c6 testing 2012-04-27 03:44:15 +01:00
UbitUmarov d8f691664a testing 2012-04-27 03:36:49 +01:00
UbitUmarov 76d9040ed4 testing 2012-04-27 02:54:39 +01:00
UbitUmarov 911bc81b00 testing 2012-04-27 02:13:54 +01:00
UbitUmarov a64a9e48de TESTING 2012-04-27 01:43:27 +01:00
Melanie 7397c9a68e Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-27 01:31:12 +01:00
UbitUmarov 30ab9647ba TEST more changes 2012-04-27 01:24:44 +01:00
UbitUmarov 61e99fba87 TEST more options to avnLocalTeleport 2012-04-27 01:18:30 +01:00
UbitUmarov 2cf6023892 TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs 2012-04-27 01:06:07 +01:00
Justin Clark-Casey (justincc) 07e62df558 Add regression test for teleporting an agent between separated regions on the same simulator.
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
Oren Hurvitz 8a65f5a70d OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.
OSSL permissions are now controlled in OpenSim.ini.
2012-04-26 22:53:13 +01:00
Oren Hurvitz 0da8fe3124 Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type. 2012-04-26 22:49:14 +01:00
Oren Hurvitz ee13d817f1 When creating an OAR, objects where the user is the Creator are always included, regardless of their permissions.
The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
2012-04-26 22:41:31 +01:00
Justin Clark-Casey (justincc) cb6791fb30 Tweak log messages on local region to region teleport path to help with problem resolution. 2012-04-26 22:35:25 +01:00
Justin Clark-Casey (justincc) d19aa9e792 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-26 21:54:50 +01:00
BlueWall 2542ca2a49 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-26 16:40:36 -04:00
BlueWall fba802bb03 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-04-26 16:13:47 -04:00