ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 19:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

107 Commits

Author SHA1 Message Date
Melanie
36d744e2a5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-07-19 09:47:51 +01:00
Dan Lake
0dd14ca0a3 Missing parameter in log error message was throwing exception 2012-07-18 13:05:48 -07:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
9ccb578721 Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. 
Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
 2012-07-13 00:44:00 +01:00
Justin Clark-Casey (justincc)
b56673c920 Fix bug with "kick user" reducing agent counts by 2 instead of 1. 
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
 2012-06-08 00:18:25 +01:00
Melanie
c5af3e384c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2012-06-08 00:14:39 +01:00
Melanie
67d4f1d66c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IScriptModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-09 21:40:03 +01:00
Diva Canto
0f277dfa17 Addresses mantis #5846 2012-04-08 17:54:59 -07:00
Melanie
37068d17c5 Merge branch 'master' into careminster 2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
bafef292f4 Take watchdog alarm calling back outside the m_threads lock. 
This is how it was originally.  This stops a very long running alarm callback from causing a problem.
 2012-02-24 05:25:18 +00:00
Melanie
3b2900e884 Merge branch 'master' into careminster 2012-02-20 19:48:28 +00:00
Diva Canto
99b9c1a9d5 More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail. 2012-02-20 10:58:07 -08:00
Diva Canto
20c65ac438 A few more tweaks on position updates and create child agents. Mono hates 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. 2012-02-19 12:28:07 -08:00
Melanie
756baff86a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2012-02-19 21:14:18 +00:00
Diva Canto
964ec57ffe Changed the async approach on close child agents. This may improve crossings a little bit. 2011-12-16 17:24:50 -08:00
Melanie
bdb5ac96d9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-11-19 22:39:15 +00:00
Justin Clark-Casey (justincc)
10a23a823e Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages 
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
 2011-11-19 01:16:07 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
a3c5f76942 Removed unused and mostly commented out SceneCommunicationService methods 
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
 2011-11-15 18:16:43 +00:00
Justin Clark-Casey (justincc)
20f26eeb17 Remove unused RegionCommsListener/IRegionCommsListener. 
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
 2011-11-15 17:38:55 +00:00
Justin Clark-Casey (justincc)
64784bc0cf remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead 2011-11-15 17:30:58 +00:00
Melanie
c7dd7b13a2 Convert SendKillObject to take a list of uint rather than sending one 
packet per prim. More to come as we change to make use of this.
 2011-11-06 20:38:07 +00:00
Melanie
abfb0c9399 Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge 2011-10-12 07:05:18 +01:00
Dan Lake
4748c19bdb Refactored "known child region" in ScenePresence. There were 4 different 
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
 2011-10-06 22:47:33 -07:00
Melanie
3889e68c54 Merge branch 'master' into careminster-presence-refactor 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs
 2011-02-07 22:08:53 +00:00
Mic Bowman
cf24069227 Change UpdateAgent (for changes in agent position) to be sent 
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
 2011-02-03 12:43:46 -08:00
Diva Canto
c18bcf3d8d A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency. 2011-01-07 10:25:49 -08:00
Melanie
e1664b8d38 Fix child agent scoping 2011-01-03 19:42:26 +00:00
Melanie
04e450e2bc Fix child agent scoping 2010-12-31 16:05:59 +01:00
Melanie
52dd547863 Make SendKillObject send multiple localIDs in one packet. This avoids the 
halting visual behavior of large group deletes and eliminates the packet flood
 2010-10-08 11:31:52 +02:00
Melanie
79bfa275da Merge branch 'master' into careminster-presence-refactor 2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
df702417dc Remove mono compiler warnings 2010-08-26 16:27:41 +01:00
sacha
478d835392 removing more stains ... 2010-08-07 21:04:16 +00:00
Diva Canto
19558f380a Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours. 2010-06-13 19:06:22 -07:00
Melanie
fdf648bcf3 Merge branch 'master' into careminster-presence-refactor 2010-06-14 02:49:15 +01:00
Tom Grimshaw
1c040d8c1e Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. 2010-05-18 03:24:43 -07:00
Melanie
107a0a4905 Merge branch 'master' into careminster-presence-refactor 2010-03-04 11:02:01 +00:00
Justin Clark-Casey (justincc)
c4ba2e5dfb minor: remove some compiler warnings 2010-03-03 23:35:23 +00:00
Melanie
028a87fe37 Merge branch 'master' into careminster-presence-refactor 
This brings careminster on the level of master. To be tested
 2010-03-03 02:07:03 +00:00
CasperW
efd4810851 Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon. 2010-02-25 12:04:51 +01:00
John Hurliman
d506449f67 * Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is 
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space
* Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
 2010-02-23 00:59:24 -08:00
Melanie
c8f3bb56ff Merge branch 'master' into careminster 2010-02-08 22:11:38 +00:00
Justin Clark-Casey (justincc)
00947cf2ca Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object 
Add a read-only Attachments property to ScenePresence
 2010-02-08 19:02:20 +00:00
Melanie
ae9362636e Line endings cleanup 2010-02-04 17:00:16 +00:00
Melanie
10f8c2ea9b Merge branch 'master' into presence-refactor 
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
 2010-01-16 00:05:08 +00:00
Diva Canto
f1c30784ac * General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic. 
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
 2010-01-15 15:11:58 -08:00
Diva Canto
4de82891a9 Bug in Teleport fixed -- Appearance was missing from AgentCircuitData. 2010-01-13 09:34:08 -08:00
Diva Canto
7356860b48 Several more buglets removed. 2010-01-13 09:17:30 -08:00
Diva Canto
011a1b3798 More appearance woes fixed, this time for child agents. Tested on a grid with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now. 2010-01-12 09:49:27 -08:00
Diva Canto
77e43f4801 Fixed a couple of bugs with Appearance. Appearance is all good now. 2010-01-11 17:30:05 -08:00