ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 09:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,031 Commits 5 Branches 106 Tags
c6d75cda974a69cd9fe3276bac182aa4c6bb1f17
Commit Graph

2495 Commits

Author SHA1 Message Date
Melanie
c6d75cda97 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
 2013-07-13 00:57:03 +01:00
Melanie
a53a10ad27 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2013-07-13 00:47:58 +01:00
Diva Canto
29f6ae199e Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before. 2013-07-12 12:53:58 -07:00
Diva Canto
604967b31e Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers. 2013-07-11 09:47:46 -07:00
Diva Canto
3b48b6a792 Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking. 2013-07-11 09:44:48 -07:00
Diva Canto
9173130fde Switched RegionHandshakeReply to Sync, because it's not doing anything blocking. 2013-07-10 20:48:13 -07:00
Diva Canto
fe5da43d15 EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. This _shouldn't_ screw things up, given that all this does is to dump the request in a queue. 2013-07-10 19:29:14 -07:00
Diva Canto
1b265b213b Added show client-stats [first last] command to expose what viewers are requesting. 2013-07-10 16:09:45 -07:00
Robert Adams
38e6da5522 Comment out old inbound UDP throttling hack. This would cause the UDP 
reception thread to sleep for 30ms if the number of available user worker
threads got low. It doesn't look like any of the UDP packet types are
marked async so this check is 1) unnecessary and 2) really crazy since
it stops up the reception thread under heavy load without any indication.
 2013-07-09 18:34:24 -07:00
Justin Clark-Casey (justincc)
095066b1ce Handle UUIDNameRequest UDP packet processing async instead of within the main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop. 
The potential impact of this should be lower now that these requests are being placed on a queue.
 2013-07-09 23:39:29 +01:00
Justin Clark-Casey (justincc)
013710168b For stat purposes, add names to capability request handlers where these were not set 2013-07-08 22:39:07 +01:00
Justin Clark-Casey (justincc)
e19defde36 Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap 
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
 2013-07-08 22:03:07 +01:00
Justin Clark-Casey (justincc)
98de67d573 Fix mono warning in LLImageManagerTests 2013-07-06 00:55:14 +01:00
Justin Clark-Casey (justincc)
55ac8c83c7 Get InventoryWorkerThreads to update watchdog on processing requests 2013-07-06 00:34:22 +01:00
Melanie
5ddcc25ee9 Merge branch 'master' into careminster 2013-07-04 22:32:58 +01:00
Justin Clark-Casey (justincc)
16f40c1a15 Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start 2013-07-04 17:29:53 +01:00
Justin Clark-Casey (justincc)
25889b2d7e change "debug packet" command to "debug lludp packet" to conform with other "debug lludp" options 
also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
 2013-07-04 00:02:53 +01:00
Diva Canto
ccca005969 HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests 2013-07-02 13:29:44 -07:00
Melanie
f70357eaa3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2013-06-23 01:59:57 +01:00
Melanie
56f4adeb60 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
 2013-06-18 01:50:08 +01:00
Justin Clark-Casey (justincc)
713a14a6b5 minor: remove mono compiler warnings in WebFetchInvDescModule 2013-06-17 23:23:56 +01:00
Justin Clark-Casey (justincc)
b9dac1f8df Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9 2013-06-17 23:17:55 +01:00
Justin Clark-Casey (justincc)
d412c1b0eb Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled. 
This also moves the abort to RemoveRegion() rather than a destructor.
 2013-06-14 23:53:20 +01:00
Melanie
162dfd8a38 Merge branch 'avination-current' into careminster 2013-06-11 21:03:02 +01:00
Melanie
745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +02:00
Melanie
cf4d291443 Merge branch 'master' into careminster 2013-06-08 00:00:39 +01:00
Melanie
3a722ef81b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-06-07 23:59:02 +01:00
Diva Canto
6aa54a8e16 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-07 16:01:07 -07:00
Diva Canto
07cc16ff9c Put the configuration back in FetchInventoryDesc2 cap. 2013-06-07 16:00:32 -07:00
Melanie
75631e0267 Supply proper type information for the various types of requests 2013-06-07 23:55:03 +01:00
Melanie
7c0bfca7a0 Adding Avination's PollService to round out the HTTP inventory changes 2013-06-07 23:43:45 +01:00
Justin Clark-Casey (justincc)
454499ff60 minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level 2013-06-07 23:38:23 +01:00
Melanie
fe4a67efb6 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
 2013-06-06 03:20:15 +01:00
Melanie
a7dbafb0e3 Port Avination's inventory send throttling 2013-06-05 23:42:50 +01:00
Melanie
9589a09eda Fix multi-wear of alpha and tattoo layers. 2013-05-31 22:02:31 +02:00
Melanie
669fa3ff9a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
 2013-05-30 21:48:09 +01:00
Melanie
533bbf033d Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 02:08:54 +01:00
Melanie
0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 01:58:50 +02:00
Mic Bowman
681fbda4b6 This is an experimental patch that adds support for comparing texture 
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
 2013-05-24 13:18:16 -07:00
Melanie
4cb7ee47f2 Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in.... 2013-05-22 23:49:34 +02:00
Melanie
42c82b564e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2013-05-16 21:59:14 +01:00
Justin Clark-Casey (justincc)
df2a0fec5f Comment out log message about looking for asset data in remove asset service for now, in order to reduce log levels in a test region with many hg origin avatars 2013-05-14 20:11:58 +01:00
Diva Canto
91091c3e54 Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents) 2013-05-14 09:06:58 -07:00
Diva Canto
645da54f25 Revert "HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!" 
This reverts commit f32a21d967.
 2013-05-14 08:47:18 -07:00
Diva Canto
f32a21d967 HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up! 2013-05-14 08:12:01 -07:00
Melanie
f9daf921f7 Explicitly zero avatar velocity on sit 2013-05-13 03:29:11 +02:00
Melanie
e8f4c7128f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-05-12 03:24:57 +01:00
Melanie
13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Diva Canto
a1031772eb Delete debug message 2013-05-10 08:09:26 -07:00
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00