Commit Graph

2136 Commits (a6928a479eb84b14e949c5f589b9ce753edf457a)

Author SHA1 Message Date
Melanie a6928a479e Add cost calculation suppor tto the VariablePrice one as well 2012-09-11 17:51:20 +02:00
Melanie ead4b8998c Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
It's actually used.

This reverts commit 94a8e5572b.
2012-09-11 17:28:37 +02:00
Melanie bd1d9a214b Add the option to have variable costing for uploads 2012-09-11 17:28:13 +02:00
Melanie 94a8e5572b Remove the unused NewFileAgentInventoryVariablePrice module. 2012-09-11 15:07:32 +02:00
Melanie a6753c14a5 Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
Melanie 657428a439 Remove commented code 2012-09-10 01:52:02 +02:00
UbitUmarov b7737b7273 webFetchInventory: change control event to simple flag, adjust locking 2012-09-10 01:20:34 +01: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
UbitUmarov c298ae9e75 bug fix 2012-09-04 10:51:43 +01: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
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
Melanie 6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00
Melanie 7e17f4296e Fix background inventory loading (Viewer 3) so it won't lag out the sim 2012-08-24 23:48:01 +02:00
Melanie 5273b6880a Allow updates sent for right pec to go to the client 2012-08-21 21:20:20 +02:00
Melanie 0a959343a5 Make the console output from the reigon console hookable 2012-08-18 22:36:48 +02:00
Melanie f21fdff4f9 Actually add the module 2012-08-14 21:58:07 +02:00
Melanie 9b014a7167 Merge branch 'careminster' into avination
Conflicts:
	OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
Melanie b9c4a637b4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc) 205f2326dc Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
All these settings are in OpenSimDefaults.ini only.  If you are using them then please adjust your OpenSim.ini
2012-08-03 23:02:39 +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
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 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
Justin Clark-Casey (justincc) a1e99642c1 Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
2012-07-25 22:29:40 +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
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
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
Melanie 668723fab3 Remove instrumentation and fix the message delivery issue 2012-07-15 23:01:58 +02:00
Melanie b130dcea21 Testing changes and instrumentation 2012-07-15 22:28:47 +02:00
Melanie 283df0610d Save packets received while the client is added and replay them later. 2012-07-15 21:45:06 +02:00
Melanie 8b4f7604e6 Revert "Experimentally handle UseCircuitCode synchrnonously"
This reverts commit e3fa73da96.
2012-07-15 19:45:08 +02:00
Melanie e3fa73da96 Experimentally handle UseCircuitCode synchrnonously 2012-07-15 17:17:59 +02: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) d6f54b25cd Stop redundantly passing in the endpoint to the LLClientView constructor.
This can always be retrieved via the LLUDPClient and is so done in various places already.
2012-07-12 23:48:42 +01:00
Justin Clark-Casey (justincc) dda999a22c Remove IClientIPEndpoint client interface for now.
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
2012-07-12 23:43:02 +01:00
Justin Clark-Casey (justincc) 3b3d9967b1 Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint. 2012-07-12 23:29:57 +01:00
Melanie 26d89777d8 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
Melanie 5776351f6a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
UbitUmarov 02cb0bf80a added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout 2012-07-04 17:40:02 +01:00