ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-23 08:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 88 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

908 Commits

Author SHA1 Message Date
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge 
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
 2015-11-01 03:01:59 +00:00
Melanie Thielker
dc6d9eadf3 Testing stage of the new versioning system. Use at own risk. May not 
work. Will eat your babies. Yada. Yada.
 2015-10-31 00:01:35 +01:00
Diva Canto
59b63b6406 On to 0.8.3! 
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
 2015-10-18 21:51:49 -07:00
Diva Canto
06d2508b96 On to 0.8.3! 2015-10-18 21:47:10 -07:00
Diva Canto
7ab633461e Fixed merge conflicts 
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090 Clean up of simulation version, the number that rules the compatibility of teleports: 
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
 2015-10-18 16:06:31 -07:00
UbitUmarov
e441c9cac1 dont let http keepalive and context reuse be true 2015-09-23 23:59:50 +01:00
UbitUmarov
c7b1d52e29 remove duplicated and breaking code 2015-09-21 17:59:44 +01:00
Melanie Thielker
f24414c063 Remove the last proprietary copyright headers, insert BSD ones. 2015-09-13 21:03:38 +02:00
UbitUmarov
cdaed11387 at last we can login and see objects ( friends is dead and disable in 
scenepresence)
 2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
48ef22f62e change pollService stop() to send 503 error and no keepalive. ( untested ) 2015-08-18 23:59:55 +01:00
UbitUmarov
05d72f77ff do keepalive on mesh and texture GET. Dont use reusecontext any where. 
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
 2015-08-18 21:32:03 +01:00
UbitUmarov
2cac56340a try to serialize http requests from same connection, so they are processed 
in order. ( next commits will be about necessary keepAlive changes needed)
 2015-08-18 21:03:34 +01:00
Justin Clark-Casey (justincc)
d52f58a733 Disable the "show threadpool calls active" console command for now. 
Whilst this can be very useful to identify threads held too long by incoming packet processing,
it can also be very misleading as the count updates are not atomic (race conditions lead to growth in numbers over time).
This could be solved by making the counts volatile but I don't currently have time to assess the performance impact, though it's almost certainly negligible.
If anybody else wants to do that and re-enable this command then please feel free.
 2015-05-12 19:54:25 +01:00
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Justin Clark-Casey (justincc)
3255335c42 Make private services forbid llHTTPRequest() calls by rejecting those that have the X-SecondLife-Shard header. 
If you need to enable this, set AllowHttpRequestIn = true in [Network] for all private services or individual [*Service] sections.
 2015-03-04 18:27:51 +00:00
Freaky Tech
f68a1a2218 XML should not contain any BOM. Disabled BOM generation in BaseHttpServer 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-03 15:35:09 -05:00
Justin Clark-Casey (justincc)
24ef043395 Make failures in PollServiceHttpRequest.DoHTTPGruntWork() actually log the exception on error 2015-01-19 23:52:34 +00:00
Diva Canto
7466ef0525 This cleans up versioning. Specifically: 
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.
 2014-12-30 12:53:31 -08:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class. 
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
 2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
f54c70741b Add "show threadpool calls active" console debug command. 
This shows named threadpool calls (excluding timer and network calls) that are currently queued or running.
Also shows total of labelled and any anonymous calls.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
72cb1cc7d6 Add "show threadpool calls" command to show count of all labelled smartthreadpool calls 2014-11-25 23:23:10 +00:00
UbitUmarov
fd79f75ba6 TEST**** wingridproxy detection at grid login. Untested possible not 
very reliable. Adds some load even on region servers because of code at
 BaseHttpServer.
 2014-10-24 02:12:30 +01:00
UbitUmarov
cd87c4bec5 change/fix previus commits 2014-10-13 12:00:31 +01:00
UbitUmarov
8558e97a44 tune poll smartThreadpool use and give it a name 2014-10-13 11:38:51 +01:00
BlueWall
96a2449122 Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."" 
Fix for break in next commit

This reverts commit 376fab1402.
 2014-09-17 20:03:54 -04:00
BlueWall
376fab1402 Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects." 
This reverts commit af286d5fcb.
Issue with Jenkins builds
 2014-09-17 18:11:41 -04:00
BlueWall
af286d5fcb Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects. 2014-09-17 17:56:10 -04:00
Melanie Thielker
ddfb05e57a Comment out stupid XEngine-bound message about script vs non-script startup, it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew. 2014-08-09 05:31:09 +02:00
Justin Clark-Casey (justincc)
1e3027afb1 Temporary stop CAPS service points from being added to stats as this can be a huge number. 
A stop gap solution - a better one may be to improve stats display on simulator-side.
Caps information is still accessible via the "show caps stats by user" and "show caps stats by cap" commands
 2014-07-26 01:41:03 +01:00
Justin Clark-Casey (justincc)
8c5c9806d7 Add stats for service endpoints using existing data. 
For each service endpoint (e.g. posts to the xinventory service), a stat is available which shows the number of requests received and moving average per second
The full name is "service.<http-method>:<path>.requests (e.g. service.POST:/xinventory.requests)
 2014-07-25 23:00:41 +01:00
UbitUmarov
86a9710e77 change previus code, send a NoEvents response back to http server, even 
if we know there is no one there, so that the server finishes handling
 it.
 2014-07-24 23:32:39 +01:00
UbitUmarov
f236b2e5d3 request.DoHTTPGruntWork(..) is now identical to our version, so use 
those again, getting code closer to os
 again
 2014-07-23 02:14:15 +01:00
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Justin Clark-Casey (justincc)
889194db63 Actually call Close() for shared region modules when the simulator is being shutdown. 
Adds regression test for this case.
 2014-07-02 23:49:25 +01:00
Justin Clark-Casey (justincc)
5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Justin Clark-Casey (justincc)
602587b8d5 Update dev version to 0.8.1 2014-06-17 18:32:26 +01:00
Robert Adams
7f0adfd203 Add [Startup]LogShowStatsSeconds=n parameter which controls the interval 
that simulator statistics is output to the console. Setting to zero turns
stats logging off.
 2014-06-13 21:27:07 -07:00
Justin Clark-Casey (justincc)
31096fb1fe Add rc3 flavour option 2014-06-10 20:19:19 +01:00
Diva Canto
20f20895cf Adds optional HTTP Basic Authentication to Robust service connectors. 2014-05-23 16:19:43 -07:00
Oren Hurvitz
882af7195c Better error-handling and logging in case User Profile requests fail 2014-05-19 11:11:06 +01:00
Oren Hurvitz
88f7a833dc Improved HTTP logging 2014-04-29 07:59:17 +01:00
Oren Hurvitz
bc06db3df4 - Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity. 
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
 2014-04-24 15:58:43 +01:00
Oren Hurvitz
d15a3b10a3 When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6". 2014-04-24 15:58:41 +01:00
Oren Hurvitz
2051535ce1 String matching in REST handlers: must allow '-' as a separator, because the "/map" handler uses it 2014-04-02 15:11:54 +01:00
Oren Hurvitz
aa217cf90f Better string matching when searching for REST handlers: must match an entire path component (ending with '/' or a similar character). 
For example, these should match: "/assets" and "/assets/12345", but these shouldn't match: "/assets" and "/assets_exist".
 2014-04-02 08:52:44 +03:00
Oren Hurvitz
bbfda8e19e Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request. 
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
 2014-04-02 06:32:41 +01:00