Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-04-29 | 5 | -22/+34 |
|\ | |||||
| * | Comment out debug [ASYNC DELETER] messages for now. | Justin Clark-Casey (justincc) | 2012-04-28 | 1 | -5/+5 |
| | | |||||
| * | Remove mono compiler warning. Adjust message log to error from info | Justin Clark-Casey (justincc) | 2012-04-28 | 1 | -2/+2 |
| | | |||||
| * | Add text about using double quotes to surround console command arguments ↵ | Justin Clark-Casey (justincc) | 2012-04-28 | 1 | -2/+8 |
| | | | | | | | | | | | | containing spaces to "help" text. e.g. show object name "My long object name" | ||||
| * | Put scene object related console commands into new "Objects" help category ↵ | Justin Clark-Casey (justincc) | 2012-04-28 | 2 | -13/+17 |
| | | | | | | | | rather than "Regions" | ||||
| * | Revert "Revert "Implement bulk inventory update over CAPS (not recursive by ↵ | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -1/+47 |
| | | | | | | | | | | | | | | | | design,"" This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d. Sorry, accidentally reverted this completely by mistake, reverting the revert. | ||||
| * | Revert "Log the full exception when errors occur in BaseHttpServer" | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -19/+19 |
| | | | | | | | | | | | | This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early. | ||||
| * | Revert "Implement bulk inventory update over CAPS (not recursive by design," | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -47/+1 |
| | | | | | | | | This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1. | ||||
| * | Add flags information (phantom, physics, etc.) to "show object" and "show ↵ | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -0/+2 |
| | | | | | | | | part" console commands | ||||
| * | Log the full exception when errors occur in BaseHttpServer | Oren Hurvitz | 2012-04-27 | 1 | -19/+19 |
| | | |||||
* | | Merge branch 'avination' | Melanie | 2012-04-29 | 8 | -228/+428 |
|\ \ | |||||
| * | | remove repeated set of group rotation to physics | UbitUmarov | 2012-04-29 | 1 | -2/+3 |
| | | | |||||
| * | | SOG bug fix in group rotations updates | UbitUmarov | 2012-04-29 | 1 | -4/+6 |
| | | | |||||
| * | | fix llGetCenterOfMass ( checked with ubitODE only) | UbitUmarov | 2012-04-28 | 4 | -9/+101 |
| | | | |||||
| * | | Oooops don't hover underground but do hover | UbitUmarov | 2012-04-27 | 1 | -26/+27 |
| | | | |||||
| * | | reorder priority of vehicle hover flags | UbitUmarov | 2012-04-27 | 1 | -109/+114 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -1/+7 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 2 | -5/+2 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -12/+9 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | itest | UbitUmarov | 2012-04-27 | 2 | -4/+4 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -13/+11 |
| | | | |||||
| * | | itest | UbitUmarov | 2012-04-27 | 1 | -2/+5 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -2/+2 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | testing.... | UbitUmarov | 2012-04-27 | 2 | -56/+102 |
| | | | |||||
| * | | ubitODE fix don't report colisions with a volume detector ( only report to it ) | UbitUmarov | 2012-04-27 | 1 | -12/+16 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -58/+71 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 2 | -2/+2 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -0/+6 |
| | | | |||||
| * | | TESTING | UbitUmarov | 2012-04-27 | 2 | -4/+5 |
| | | | |||||
| * | | TEST more changes | UbitUmarov | 2012-04-27 | 1 | -1/+2 |
| | | | |||||
| * | | TEST more options to avnLocalTeleport | UbitUmarov | 2012-04-27 | 1 | -4/+9 |
| | | | |||||
| * | | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵ | UbitUmarov | 2012-04-27 | 1 | -0/+22 |
| | | | | | | | | | | | | Stopped) to scenepresence.cs | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 11 | -45/+192 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | ||||
| * | | Fixed: custom walking animations didn't stop when the avatar stopped walking. | Oren Hurvitz | 2012-04-27 | 2 | -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 Hurvitz | 2012-04-27 | 3 | -9/+45 |
| | | | | | | | | | | | | affect the starting position in the destination region. | ||||
| * | | Use DotNetZip to compress OARs and IARs. | Oren Hurvitz | 2012-04-27 | 2 | -2/+8 |
| | | | | | | | | | | | | DotNetZip provides much better compression than standard .NET. | ||||
| * | | minor: style adjustments in SensorRepeat, mainly related to patch from stoehr | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -3/+4 |
| | | | |||||
| * | | Fixing wrong position of llSensor, SensePoint wasnt following the rotation ↵ | Stefan_Boom | 2012-04-27 | 1 | -8/+22 |
| | | | | | | | | | | | | of the root prim. | ||||
| * | | MapImageService: changed the event at which the map tiles are uploaded, ↵ | Diva Canto | 2012-04-27 | 2 | -5/+14 |
| | | | | | | | | | | | | because they were being uploaded before the region was registered with the grid | ||||
| * | | MapImage security issue. Compare strings instead of IPAddresses. | Diva Canto | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | MapImage security issue: better error messages | Diva Canto | 2012-04-27 | 1 | -3/+5 |
| | | | |||||
| * | | Amend to last commit: account for the existence of proxies. | Diva Canto | 2012-04-27 | 1 | -3/+32 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-27 | 68 | -666/+814 |
| |\ \ | |||||
| * | | | Minor change in error message (HG teleport failures) | Diva Canto | 2012-04-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | MapImageService: added an additional security check for OSGrid and other ↵ | Diva Canto | 2012-04-27 | 1 | -5/+43 |
| | | | | | | | | | | | | | | | | grids like it. | ||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 64 | -639/+734 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | 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-27 | 49 | -307/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |