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
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

121 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Diva Canto
c94c929ec1 Amend to previous commit -- set the culture also on the receiving end. 2016-06-22 18:35:14 -07:00
Diva Canto
1e213f5150 Mantis #7802: added debug message to diagnose the problem. 2016-06-22 15:55:39 -07:00
UbitUmarov
e2796e6044 fix typo 2015-12-02 04:26:30 +00:00
UbitUmarov
ae3e288b14 createAgent needs to be sync 2015-12-02 04:24:58 +00:00
Melanie Thielker
f88e4a1ec9 Plumb the rest of the context stuff. Well, what I see so far anyway 2015-11-02 00:23:38 +01:00
Melanie Thielker
5f18f2ce6a More EntityTransferContext plumbing 2015-11-01 19:37:14 +01:00
Melanie Thielker
69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
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
efcf0e4f2e Minor: Add an initializer to show what the default value would be. 2015-11-01 01:03:44 +01:00
Melanie Thielker
5f3b443c03 Remove an unneeded code path, it could never be reached. Ubit caught it 
:)
 2015-11-01 00:57:45 +01:00
Melanie Thielker
2198330142 This is the replacement fix for large regions and string version. 2015-11-01 00:40:13 +01:00
Melanie Thielker
6d0b45cd4e Revert "fix transfer protocol version in string format. These are not 
fixes you are looking for..... (Jedi mind trick)

This reverts commit 19e5667451.
 2015-11-01 00:35:27 +01:00
UbitUmarov
19e5667451 fix transfer protocol version in string format. Let that case have tests identical to new format (this still isnt for your babies keep them safe...) 2015-10-31 21:50:24 +00:00
Melanie Thielker
ea56f4f27c Introduce an EntityTransferContext carrying the version numbers to pass 
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
 2015-10-31 18:13:02 +01:00
Melanie Thielker
dc6bdbf740 Put back the option of having asymmetrical protocol versions in 
transfers
 2015-10-31 16:57:24 +01:00
UbitUmarov
1030d07f31 simplify new regions protocol version control. (May not work, and babies safety warnings still valid 2015-10-31 12:57:14 +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
Melanie Thielker
2b437f8d86 Let the initiator of a teleport or crossing know that we handle extra 
wearables
 2015-10-20 00:58:16 +02: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
ce883e9b43 add more of the v03 checks and homeURL. Sending side only for now 2015-08-26 05:29:08 +01:00
Melanie Thielker
17e920aacd More plumbing on agent states 2015-08-20 00:40:49 +02:00
Melanie Thielker
028506cf3c Partial plumbing for the agent stateful module features negotiation 2015-08-20 00:18:45 +02:00
Melanie Thielker
cf402812b7 Fix content type checking to confirm to newer core versions 2015-03-10 01:03:31 +01: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
Melanie Thielker
45739e3d5c Fix a string format 2014-09-24 23:10:15 +02:00
UbitUmarov
df773ee8c3 make CreateAgent sync for logins, async for other cases 2014-09-24 20:57:23 +01:00
UbitUmarov
c9079360b9 coment out stack trace at newUserConnection, add log msh at createAgent 2014-09-24 18:37:59 +01:00
UbitUmarov
68ea1f7776 TEST do createAgent sync, forcing grid services and other regions to wait 
for it to complet.  This is not that good, but maybe needed
 2014-09-24 17:56:58 +01:00
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Diva Canto
fe779128b0 Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer. 2014-06-06 11:04:53 -07:00
Oren Hurvitz
47b84875fd Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different. 
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
 2014-05-19 11:19:11 +01:00
Diva Canto
7f570636f8 Please note: older simulators (0.7.6) still send the info about gzip in ContentType 2014-05-04 11:41:52 -07:00
Oren Hurvitz
06e0528d0b In teleports, pass the source region to the destination (similar to an HTTP referrer) 2014-04-09 09:22:20 +01:00
Oren Hurvitz
85d51e57a9 When sending QueryAccess to a region, also send the user's Home URI 2014-04-07 07:32:36 +01:00
Oren Hurvitz
6d1d58b654 Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding" 2014-03-25 18:09:23 +01:00
Oren Hurvitz
b1d8aa0b64 Use the "Content-Encoding" header to indicate gzipped streams 2014-03-25 15:36:59 +01:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Diva Canto
f3b3e21dea Change the auth token to be the user's sessionid. 2013-07-14 07:28:40 -07:00
Diva Canto
b4f1b9acf6 Guard against unauthorized agent deletes. 2013-07-13 21:28:46 -07:00
Diva Canto
931eb892d9 Deleted GET agent all around. Not used. 2013-07-13 17:56:42 -07:00
Justin Clark-Casey (justincc)
c3db595944 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-07-08 22:07:27 +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
Diva Canto
bbb9af363d Print out caller IP when unusual requests are received. 2013-07-07 20:43:42 -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
Diva Canto
6c7e33fe47 Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region. 2013-06-22 08:29:06 -07:00
Diva Canto
4778d67005 Finally moved HG agent transfers to use agent fatpacks. 2013-06-21 20:52:46 -07: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)
3bc8cf65a4 Where this is not already happening, trigger asychoronous calls to CloseChildAgent() above the LocalSimulationConnector level. 
This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
 2013-05-16 17:30:30 +01:00