aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-294-20/+26
|\
| * Comment out debug [ASYNC DELETER] messages for now.Justin Clark-Casey (justincc)2012-04-281-5/+5
| |
| * Remove mono compiler warning. Adjust message log to error from infoJustin Clark-Casey (justincc)2012-04-281-2/+2
| |
| * Put scene object related console commands into new "Objects" help category ↵Justin Clark-Casey (justincc)2012-04-282-13/+17
| | | | | | | | rather than "Regions"
| * Revert "Revert "Implement bulk inventory update over CAPS (not recursive by ↵Justin Clark-Casey (justincc)2012-04-271-1/+47
| | | | | | | | | | | | | | | | design,"" This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d. Sorry, accidentally reverted this completely by mistake, reverting the revert.
| * Revert "Implement bulk inventory update over CAPS (not recursive by design,"Justin Clark-Casey (justincc)2012-04-271-47/+1
| | | | | | | | This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
| * Add flags information (phantom, physics, etc.) to "show object" and "show ↵Justin Clark-Casey (justincc)2012-04-271-0/+2
| | | | | | | | part" console commands
* | Merge branch 'avination'Melanie2012-04-298-228/+428
|\ \
| * | remove repeated set of group rotation to physicsUbitUmarov2012-04-291-2/+3
| | |
| * | SOG bug fix in group rotations updatesUbitUmarov2012-04-291-4/+6
| | |
| * | fix llGetCenterOfMass ( checked with ubitODE only)UbitUmarov2012-04-284-9/+101
| | |
| * | Oooops don't hover underground but do hoverUbitUmarov2012-04-271-26/+27
| | |
| * | reorder priority of vehicle hover flagsUbitUmarov2012-04-271-109/+114
| | |
| * | testUbitUmarov2012-04-271-1/+7
| | |
| * | testUbitUmarov2012-04-272-5/+2
| | |
| * | testUbitUmarov2012-04-271-12/+9
| | |
| * | testUbitUmarov2012-04-271-1/+1
| | |
| * | itestUbitUmarov2012-04-272-4/+4
| | |
| * | testUbitUmarov2012-04-271-13/+11
| | |
| * | itestUbitUmarov2012-04-271-2/+5
| | |
| * | testUbitUmarov2012-04-271-2/+2
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | testing....UbitUmarov2012-04-272-56/+102
| | |
| * | ubitODE fix don't report colisions with a volume detector ( only report to it )UbitUmarov2012-04-271-12/+16
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | testingUbitUmarov2012-04-271-58/+71
| | |
| * | testingUbitUmarov2012-04-272-2/+2
| | |
| * | testingUbitUmarov2012-04-271-0/+6
| | |
| * | TESTINGUbitUmarov2012-04-272-4/+5
| | |
| * | TEST more changesUbitUmarov2012-04-271-1/+2
| | |
| * | TEST more options to avnLocalTeleportUbitUmarov2012-04-271-4/+9
| | |
| * | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵UbitUmarov2012-04-271-0/+22
| | | | | | | | | | | | Stopped) to scenepresence.cs
* | | Merge branch 'master' into careminsterMelanie2012-04-2710-40/+118
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-272-20/+32
| | | | | | | | | | | | | | | | | | 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 feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
| * | If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-273-9/+45
| | | | | | | | | | | | affect the starting position in the destination region.
| * | Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-272-2/+8
| | | | | | | | | | | | DotNetZip provides much better compression than standard .NET.
| * | minor: style adjustments in SensorRepeat, mainly related to patch from stoehrJustin Clark-Casey (justincc)2012-04-271-3/+4
| | |
| * | Fixing wrong position of llSensor, SensePoint wasnt following the rotation ↵Stefan_Boom2012-04-271-8/+22
| | | | | | | | | | | | of the root prim.
| * | MapImageService: changed the event at which the map tiles are uploaded, ↵Diva Canto2012-04-271-3/+12
| | | | | | | | | | | | because they were being uploaded before the region was registered with the grid
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-2759-320/+457
| |\ \
| * | | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-2755-293/+377
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-2743-206/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.Oren Hurvitz2012-04-261-13/+12
| | | | | | | | | | | | | | | | OSSL permissions are now controlled in OpenSim.ini.
| * | | When creating an OAR, objects where the user is the Creator are always ↵Oren Hurvitz2012-04-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-265-25/+48
| | | | | | | | | | | | | | | | problem resolution.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-266-10/+144
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-262-5/+5
| | |\ \ \
| | * \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-2625-358/+423
| | |\ \ \ \
| | * | | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-266-10/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>