Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-03 | 1 | -1/+1 | |
|\ | ||||||
| * | Fixes Mantis #5999. llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause ↵ | Snoopy Pfeffer | 2012-05-03 | 1 | -1/+1 | |
| | | | | | | | | a runtime error. | |||||
* | | Reinsert a 2000ms delay before closing a no longer required agent on the ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 2 | -6/+17 | |
|/ | | | | | | | | | source region after teleport to resolve Imprudence teleport problems. Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region. If Imprudence receives a DisableSimulator in this period, it quits. We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly. This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete. | |||||
* | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-05-03 | 3 | -10/+5 | |
| | ||||||
* | Implement optional name and description on http stream handlers so that we ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 20 | -164/+255 | |
| | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing. | |||||
* | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ↵ | Justin Clark-Casey (justincc) | 2012-05-01 | 1 | -1/+1 | |
| | | | | | | | | | | | to be closed because it is no longer in the child's view distance. This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success. There are no async operations between this sleep and the WaitForCallback() If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection. If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue. Tested on standalone, local grid and distributed grid. Please revert if there's something that I've missed. | |||||
* | Remove some test code that accidentally crept in with 9d2e1c67 | Justin Clark-Casey (justincc) | 2012-05-01 | 1 | -3/+0 | |
| | ||||||
* | Add regression test for teleporting between neighbouring regions on the same ↵ | Justin Clark-Casey (justincc) | 2012-05-01 | 7 | -19/+142 | |
| | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread. | |||||
* | Move max teleport distance check down into etm.DoTeleport() since this ↵ | Justin Clark-Casey (justincc) | 2012-05-01 | 1 | -40/+41 | |
| | | | | should apply to all teleport calls, not just those through Teleport() | |||||
* | refactor: Split most of EntityTransferModule.Teleport() into its same region ↵ | Justin Clark-Casey (justincc) | 2012-05-01 | 4 | -130/+198 | |
| | | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in. | |||||
* | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵ | Justin Clark-Casey (justincc) | 2012-04-30 | 3 | -4/+9 | |
| | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted. | |||||
* | llGenerateKey implementation. Creates a random UUID I.E: ↵ | TBG Renfold | 2012-04-30 | 3 | -0/+13 | |
| | | | | | | UUID.Random().ToString(); Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk> | |||||
* | refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵ | Justin Clark-Casey (justincc) | 2012-04-30 | 1 | -73/+75 | |
| | | | | into SendControlsToScripts() (instead of SendControlToScripts()). | |||||
* | Fixed: scripted controls didn't work if the avatar was sitting down | Oren Hurvitz | 2012-04-30 | 1 | -9/+15 | |
| | | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22 | |||||
* | 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 | |
| | ||||||
* | 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 "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 | |||||
* | 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 | 1 | -3/+12 | |
| | | | | because they were being uploaded before the region was registered with the grid | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-27 | 59 | -320/+457 | |
|\ | ||||||
| * | Add regression test for teleporting an agent between separated regions on ↵ | Justin Clark-Casey (justincc) | 2012-04-27 | 43 | -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 Hurvitz | 2012-04-26 | 1 | -13/+12 | |
| | | | | | | | | OSSL permissions are now controlled in OpenSim.ini. | |||||
| * | When creating an OAR, objects where the user is the Creator are always ↵ | Oren Hurvitz | 2012-04-26 | 1 | -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-26 | 5 | -25/+48 | |
| | | | | | | | | problem resolution. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-26 | 6 | -10/+144 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-04-26 | 2 | -5/+5 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-04-26 | 25 | -358/+423 | |
| | |\ \ | ||||||
| | * | | | Add a version of osNpcSay that takes a channel number Mantis 5747 | Talun | 2012-04-26 | 6 | -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> | |||||
| * | | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ↵ | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -35/+35 | |
| | | | | | | | | | | | | | | | | | | | | analysis complexity | |||||
| * | | | | minor: Add more detail to unauthorized caps client message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+4 | |
| | | | | | ||||||
| * | | | | minor: Add region name to dropped inbound packet message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+3 | |
| | |_|/ | |/| | | ||||||
| * | | | minor: Add avatar name to removing agent log message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Comment out avatar move to target message for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+3 | |
| | |/ | |/| | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 2 | -7/+47 | |
| |\ \ | ||||||
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 2 | -7/+47 | |
| | | | | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | |||||
| * | | | Add a configuration switch to turn on/off the use of the trash | Mic Bowman | 2012-04-25 | 2 | -1/+3 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 39 | -769/+1283 | |
| |\ \ | ||||||
| * | | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971 | |||||
* | | | | Minor change in error message (HG teleport failures) | Diva Canto | 2012-04-27 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Slight rewording of output messages. | Diva Canto | 2012-04-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-24 | 2 | -1/+13 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-25 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * | | | zero out SP velocity before calling SP.Teleport(), as the client expects ↵ | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment) |