ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 13:15:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,461 Commits 5 Branches 96 Tags
master
Commit Graph

1268 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
f0178a6a41 refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Linden.UDP 
This is to allow it to use OpenSim.Framework.Monitoring in the future.
This is also a better location since the packet pool is linden udp specific
 2012-10-05 01:12:56 +01:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
ubit
653d97b739 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-24 22:25:21 +02:00
UbitUmarov
ca67ee60ac add missing transactionID in SendInventoryItemCreateUpdate. and make use 
of it on inventoryAccessModule, etc. Most likelly it's needs where there
 is a transactionID not zero
 2012-09-24 21:22:08 +01:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
ubit
b776aa1665 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-08 13:35:09 +02:00
UbitUmarov
a91ca984d5 llClientView: try to have only one thread per client processing 
RegionHandleRequests. (code assumes packet handle is called async as it is not)
 2012-09-08 12:22:40 +01:00
ubit
a6bbaba7ef Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 08:42:15 +02:00
UbitUmarov
d4fad2ba42 a forgotten file plus minor changes. Imp and SL viewer seem to preserve 
flight. FS 4.2.2 does not.
 2012-09-04 07:32:03 +01:00
ubit
c93b2db9f2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-01 03:12:10 +02:00
Melanie
1b15144208 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-08-31 01:32:18 +01:00
Melanie
68814f904e Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled. 2012-08-31 00:37:27 +01:00
Melanie
fd92560649 Merge branch 'avination' into careminster 2012-08-31 00:34:22 +01:00
ubit
194eb78b90 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 01:29:43 +02:00
Melanie
211f4fb411 Sequence inventory descendents requests to reduce inventory server load and 
movement lag.
 2012-08-30 00:34:12 +02:00
Melanie
74465df43f Fix issue with the quit packet being stuck int he queue and a one packet delay. 
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
 2012-08-29 11:45:28 +02:00
Melanie
34f0694938 Remove Justin's addition to avoid sending incoming packets to inactive clients 
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
 2012-08-29 11:35:21 +02:00
Melanie
378a79e7cc Add a queue with two priority levels. This is a drop in replacement for 
the BlockingQueue from OMV, but allows two priorities.
 2012-08-28 22:17:17 +02:00
ubit
7a4dba2fdc Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-25 16:33:29 +02:00
Melanie
f8603a215d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-23 01:41:47 +01:00
Melanie
5273b6880a Allow updates sent for right pec to go to the client 2012-08-21 21:20:20 +02:00
Justin Clark-Casey (justincc)
bcbd450fe4 Add --force flag to "kick user" console command to allow bypassing of recent race condition checks. 
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
 2012-08-20 20:24:54 +01:00
Melanie
dd0556abc9 Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL. 2012-08-19 22:05:38 +01:00
ubit
dfb77330a8 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
 2012-08-04 11:42:59 +02:00
ubit
d259b6e57e Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-03 17:27:59 +02:00
ubit
0549dde3c6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-03 16:22:34 +02:00
UbitUmarov
879d1cefb8 clientview IsActive use is broken. Suspend it's use keeping it true ( to 
review later)
 2012-08-03 15:19:31 +01:00
Melanie
b8ba224b4f Remove another superflouous IsActive set 2012-08-03 15:33:30 +02:00
Melanie
d677db338d Remove a merge artefaci in IsActive handling and restore commented out correct one 2012-08-03 15:22:53 +02:00
ubit
254d3e1ad3 merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	bin/Regions/Regions.ini.example
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
 2012-08-02 18:21:08 +02:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Melanie
6930d696e9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-07-25 18:19:12 +01:00
Justin Clark-Casey (justincc)
ef8570f789 Extend region console "show queues" command to show already collected time since last packeted received by the simulator from a viewer. 2012-07-24 23:39:31 +01:00
Melanie
112df30ea3 Merge branch 'avination' into careminster 2012-07-23 19:32:08 +01:00
ubit
23be64c132 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-23 20:18:07 +02:00
Melanie
b1b3057adc Fix double-ping on logout by not sending a stop packet to the client 
if the client told us it wants to log out in the first place.
 2012-07-21 20:56:19 +02:00
Melanie
df866fd300 Merge branch 'avination' into careminster 2012-07-20 09:35:22 +01:00
Melanie
7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc)
d1d331a4c0 Make LLClientView instant message handling asynchronous rather than synchronous to prevent long operations from holding up all inbound packet processing. 
Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service.
Handling this asynchronously instead stops this delay from disrupting all avatars in the scene.  This has been shown in OSGrid.
I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages.
Thanks to Nebadon for testing this change out.
 2012-07-19 23:20:03 +01:00
Justin Clark-Casey (justincc)
ba80f137b5 Prevent race conditions between two threads that call LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to reconnect) 2012-07-19 22:32:27 +01:00
Melanie
ce8b9e6c57 Fix slow loading of task inventory 2012-07-19 12:27:36 +02:00
ubit
e925b0654d Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 02:07:21 +02:00
Melanie
c256447f46 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-16 22:22:42 +01:00
ubit
d3d877ceca Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-16 00:46:22 +02:00
UbitUmarov
3149eca68f backkick git 2012-07-15 23:45:47 +01:00
ubit
5c145aa539 merge fix 2012-07-16 00:43:35 +02:00
ubit
8568771015 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-16 00:38:05 +02:00
UbitUmarov
cdd03acffa just a kick git 2012-07-15 23:37:31 +01:00
ubit
911ca5b806 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-07-16 00:34:51 +02:00