aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Reinsert a 2000ms delay before closing a no longer required agent on the ↵Justin Clark-Casey (justincc)2012-05-031-2/+7
| | | | | | | | | 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 warningsJustin Clark-Casey (justincc)2012-05-031-6/+1
|
* Comment out the five second sleep in etm.DoTeleport() if the old agent needs ↵Justin Clark-Casey (justincc)2012-05-011-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 9d2e1c67Justin Clark-Casey (justincc)2012-05-011-3/+0
|
* Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-012-7/+30
| | | | | | | 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-011-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-012-122/+159
| | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-271-0/+6
| | | | affect the starting position in the destination region.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-273-20/+39
|\
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-272-2/+3
| | | | | | | | | | | | | | | | 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.
| * Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-262-18/+36
| | | | | | | | problem resolution.
* | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
|/
* Slight rewording of output messages.Diva Canto2012-04-241-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-241-0/+1
|\
| * zero out SP velocity before calling SP.Teleport(), as the client expects ↵Justin Clark-Casey (justincc)2012-04-251-0/+1
| | | | | | | | (though this is also effectively done by physics at the moment)
* | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
|/
* Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-251-1/+1
|
* Improve teleport log debug and error messages to tell us who is teleporting.Justin Clark-Casey (justincc)2012-04-251-3/+14
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-061-4/+4
|\
| * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-071-3/+3
| | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage.
| * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-071-1/+1
| | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
* | Moved the inventory manipulation from HGEntityTransferModule to ↵Diva Canto2012-04-063-150/+159
|/ | | | HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
* Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-241/+1
|
* WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵Diva Canto2012-04-061-21/+295
| | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
* Eliminate race condition where many callers would check SOP.PhysicsActor != ↵Justin Clark-Casey (justincc)2012-04-031-4/+4
| | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it.
* minor: small message adjustment and unnecessary code elimination when ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | notifying client of no build permission
* fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-0/+5
|
* HG 2.0 Suitcase inventory: proof of concept now working properly with the ↵Diva Canto2012-03-281-10/+11
| | | | heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.
* HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵Diva Canto2012-03-281-7/+61
| | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+29
|\
| * Add "friends show cache <first-name> <last-name>" command for debugging ↵Justin Clark-Casey (justincc)2012-03-281-0/+29
| | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
* | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵Diva Canto2012-03-271-10/+44
|/ | | | guarded by an obscure config that no one but me should be using at this point.
* User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-0/+15
| | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* HG: beginning of a more restrictive inventory access procedure (optional). ↵Diva Canto2012-03-272-3/+29
| | | | Experimental: we'll try switching the root folder from under the viewer.
* HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-202-42/+54
| | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-172-7/+34
| | | | direct user connections.
* Amend to previous commit: normalize strings ToLower.Diva Canto2012-03-171-2/+6
|
* More on HG access control. This commit splits the UserManagementModule into ↵Diva Canto2012-03-172-40/+181
| | | | the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
* Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ↵Diva Canto2012-03-171-0/+62
| | | | UserManagementModule where it belongs. No functional changes.
* Teleports: bounce off repeated requests of teleporting the same agent. Some ↵Diva Canto2012-03-131-0/+13
| | | | scripts do that, and that fails the whole thing.
* More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
|
* More on the freeze on HG inventory transfers: spawn a threadlet on the ↵Diva Canto2012-03-081-1/+1
| | | | functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-083-4/+5
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵Diva Canto2012-02-251-1/+1
| | | | there.
* Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-5/+4
| | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
|
* A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-191-4/+8
| | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
* minor formatting changes from last commit (4486n7d)Justin Clark-Casey (justincc)2012-02-161-4/+3
|
* Fix: Object owned by the group does not return to the last owner ↵PixelTomsen2012-02-161-0/+6
| | | | http://opensimulator.org/mantis/view.php?id=5404
* Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-101-2/+10
| | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825