aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for ↵Justin Clark-Casey (justincc)2013-08-121-1/+112
| | | | V2 transfer protocol.
* Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-092-14/+22
|\
| * Comment back out seed dump code enabled in b1c26a56. Also adds a few ↵Justin Clark-Casey (justincc)2013-08-091-16/+22
| | | | | | | | teleport comments.
| * Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-082-26/+28
| | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators
* | Better error reporting when registering LSL function extensions (comms module).Robert Adams2013-08-081-4/+13
| | | | | | | | | | | | For unknown reasons, a dynamic function signature cannot have more than 5 parameters. Error message now tells you this fact so you can curse MS and then go change your function definitions.
* | * Added set water height <height> [<x>] [<y>] console command following the ↵teravus2013-08-071-1/+30
|/ | | | set terrain heights console command as an example.
* minor: add some method doc to ScenePresence fields used for entity transfer, ↵Justin Clark-Casey (justincc)2013-08-071-5/+9
| | | | | | add minor details to some log messages, rename a misleading local variable name. No functional changes.
* Add post-CreateAgent teleport cancellation/abortion functionality from v1 ↵Justin Clark-Casey (justincc)2013-08-071-0/+21
| | | | | | | transfer protocol into v2. This stops OpenSimulator still trying to teleport the user if they hit cancel on the teleport screen or closed the viewer whilst the protocol was trying to create an agent on the remote region. Ideally, the code may also attempt to tell the destination simulator that the agent should be removed (accounting for issues where the destination was not responding in the first place, etc.)
* Comment out debug log lines about script modules comms for now.Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | If this is an issue, could change log4net config instead to allow re-enablement
* More on HG inventory and OutboundPermission: disallowing giving inventory to ↵Diva Canto2013-08-031-1/+12
| | | | foreigners if OutboundPermission is false
* HG: If OutboundPermission is set to false, let's enforce stricter ↵Diva Canto2013-08-031-0/+31
| | | | permissions by not allowing objects to be taken to inventory.
* Making the J2KDecoderModule decoder function async. Could this be the cause ↵Diva Canto2013-08-031-1/+1
| | | | of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it.
* Amend Justin's last commit regarding the new config var ServiceVersion. The ↵Diva Canto2013-08-021-1/+2
| | | | section may not exist at all.
* Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be ↵Justin Clark-Casey (justincc)2013-08-022-27/+27
| | | | | | | | manually forced in a new [SimulationService] config setting. This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not "SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol. Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
* minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in ↵Justin Clark-Casey (justincc)2013-08-021-1/+1
| | | | InventoryAccessModules.RezObject() - structs are passed by value
* Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-16/+15
| | | | multiple attachments changes (e.g. change outfit) are also throttled
* Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-15/+87
| | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
* HGWorldMapModule: unregister event on RemoveRegionDiva Canto2013-07-311-1/+10
|
* HGWorldMapModule: check whether it's enabled or not.Diva Canto2013-07-311-0/+6
|
* Avoid another null ref opportunity.Diva Canto2013-07-301-1/+1
|
* Fix null ref.Diva Canto2013-07-301-1/+1
|
* Doing the HG Map / SimulatorFeatures "the right way": moved it to ↵Diva Canto2013-07-301-2/+45
| | | | | | | HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does). Only HG Visitors get this var, to avoid spamming local users. The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
* Removed commented lines and useless debug messageDiva Canto2013-07-281-1/+0
|
* Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ↵Diva Canto2013-07-282-39/+198
| | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
* This makes people search work.Diva Canto2013-07-281-0/+41
|
* Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-2/+2
| | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
* Fix regression from 056a6ee7 because the RemoteSimulationConnector uses a ↵Justin Clark-Casey (justincc)2013-07-261-2/+5
| | | | copy of the LocalSimulationConnector but never initializes it (hence ServiceVersion was never set)
* Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-262-4/+18
| | | | week's SIMULATOR/0.1 protocol for now.
* This should fix all issues with teleports. One should be able to TP as fast ↵Diva Canto2013-07-252-11/+11
| | | | | | | | | as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on: - Child and root agents are only closed after 15 sec, maybe - If the user comes back, they aren't closed, and everything is reused - On the receiving side, clients and scene presences are reused if they already exist - Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
* Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2 ↵Justin Clark-Casey (justincc)2013-07-261-7/+7
| | | | | | | | | seconds before closing root agent after 15. This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close. The 2 second delay is within the scope where a normal viewer would not allow a teleport back anyway. Simulator/0.2 (V2) protocol will continue with the longer delay since this is actually the behaviour viewers get from the ll grid and an early close causes other issues (avatar being sent to infinite locations temporarily, etc.)
* Reset DoNotClose scene presence teleport flag before pausing. Rename ↵Justin Clark-Casey (justincc)2013-07-261-2/+4
| | | | DoNotClose to DoNotCloseAfterTeleport
* If a returning teleport starts to reuse a downgraded child connection that ↵Justin Clark-Casey (justincc)2013-07-261-1/+9
| | | | | | | | was a previous root agent, do not close that child agent at the end of the 15 sec teleport timer. This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed. This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents. Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
* Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect ↵Diva Canto2013-07-241-2/+2
| | | | was always present, this seems to have fixed it.
* Deleted all [ZZZ] debug messages.Diva Canto2013-07-241-1/+0
|
* The previous commit did fix the infinity problem! I'm putting the same time ↵Diva Canto2013-07-241-7/+13
| | | | on TP_V1 and adding a big red warning on top of those lines.
* Today's wild shot at the infinity problem. Wait on the child agent left behind.Diva Canto2013-07-241-1/+3
|
* More on putting TP V1 as it wasDiva Canto2013-07-241-16/+16
|
* Minor improvements on TP V1 trying to make it exactly as it was before.Diva Canto2013-07-241-15/+17
|
* New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-242-68/+197
| | | | | | | | the destination is being checked) In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions. This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region. Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
* Further tweaks on TPs: not sending the callback URL and instead waiting ↵Diva Canto2013-07-242-27/+34
| | | | | | 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement. Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
* EXPERIMENTAL: yet another variation of ES/EAC/TPFinishDiva Canto2013-07-241-39/+39
|
* For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess ↵Justin Clark-Casey (justincc)2013-07-231-2/+2
| | | | what looks like a very significant reducing in GUN occurrances
* Don't touch the Current Outfit folder also on coming back homeDiva Canto2013-07-231-1/+9
|
* In renaming the folders for hypergriding, don't rename the Current Outfit ↵Diva Canto2013-07-231-1/+1
| | | | folder. The viewer doesn't like that.
* Don't post Link asset types back to the home gridDiva Canto2013-07-231-3/+6
|
* Removed the MapItems thread. Redirected the map items requests to the ↵Diva Canto2013-07-162-9/+45
| | | | services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
* Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-162-10/+27
| | | | the interface, so that duplicate requests aren't enqueued more than once.
* UserManagementModule: in the continuation, call the method that also looks ↵Diva Canto2013-07-161-2/+2
| | | | up the cache, because the resource may be here in the meantime
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-161-2/+4
|\
| * Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-161-2/+4
| | | | | | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.