Commit Graph

276 Commits (master)

Author SHA1 Message Date
UbitUmarov 563d5d30ee some more suport for a new inventory and asset type 2020-05-27 00:04:19 +01:00
UbitUmarov 0bfacb7892 change hg link request log message 2020-05-20 03:02:01 +01:00
UbitUmarov ac7187eada avoid a null ref, plus some cleanup 2020-05-07 02:02:50 +01:00
Melanie be34b8e79d Fix build break 2019-10-06 23:57:47 +01:00
Melanie eb55f7f2bc Introduce a way to send the grid's message kay, if one is used 2019-10-06 23:24:41 +01:00
UbitUmarov 27a40461e2 do removed the old API function (replaced in 2016). Thanks Terry for finding this old Bug 2019-09-23 16:29:33 +01:00
UbitUmarov 64834a880d fix a HGsuitcase API 2019-09-23 15:59:15 +01:00
Melanie d6723dab37 Merge branch 'master' of brain.opensimulator.org:/var/git/opensim 2019-07-27 12:10:28 +01:00
Melanie 2f52a3b124 When using FSAssets, the HGAssetService would still use AssetService.
This introduces a new HGAssetService config option named BackingService,
which defaults to the old behaviour, loading AssetService. It can, however,
be used to load FSAssets for HG assets, which eliminates numerous problems.
2019-07-13 13:33:34 +01:00
Melanie aedaa32ddc When using FSAssets, the HGAssetService would still use AssetService.
This introduces a new HGAssetService config option named BackingService,
which defaults to the old behaviour, loading AssetService. It can, however,
be used to load FSAssets for HG assets, which eliminates numerous problems.
2019-07-13 13:30:15 +01:00
UbitUmarov b7c1d6e7f5 UserAgentService: change handling of its external IP 2019-04-06 16:09:42 +01:00
UbitUmarov c3933ce8b9 replace some string tests 2018-07-08 13:41:55 +01:00
UbitUmarov 60644b440b we don't use tab simbol, we use 4 whitespaces 2018-07-08 13:26:41 +01:00
Vincent Sylvester 6e3f934c4b Add mac banning
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2018-07-08 13:05:47 +01:00
UbitUmarov 0ad6ba11fe pesty warning 2018-01-17 23:55:30 +00:00
UbitUmarov a4e7ab6fcf avoid a null ref 2017-08-03 18:09:26 +01:00
UbitUmarov d08df7bda7 mantis 8165: fix a null ref on hg gatekeeper on another place 2017-05-12 15:22:16 +01:00
UbitUmarov 5e577baa10 fix a null ref on hg gatekeeper 2017-05-12 14:42:21 +01:00
UbitUmarov 8bdd4c3ed9 yes it is not destiny grid but destination.. thx u know who :) 2017-05-12 12:30:59 +01:00
UbitUmarov cc95b7e2d4 don't allow multiple presences of same avatar also on HG gatekeeper 2017-05-11 20:26:06 +01:00
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker 995242b351 Suppress misleading message when logging in locally
The gatekeeper and travel info address will not actually be set there,
stop OpenSim from showing a blank address. It's confusing.
2017-01-03 18:31:17 +00:00
Melanie Thielker 966e50d90c Add the HGRemoteAssetService. Allows to use any asset service with HG 2017-01-02 19:30:40 +00:00
UbitUmarov e2b580e569 HG LinkRegion sends region size also 2016-11-20 03:51:38 +00:00
UbitUmarov 1337f5f26e remove a parameter for detection of grid fail to suport getting multiple user accounts per call and handle it where needed. 2016-08-13 23:41:57 +01:00
UbitUmarov 7c1b2a5dde add some wiring to have GetUserAccounts for multiple IDs on a single request to grid services. Unfinished, untested 2016-08-13 05:22:29 +01:00
Melanie Thielker ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
2016-07-04 03:35:48 +01:00
Diva Canto ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
Melanie Thielker 69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov 24472c3b67 fix merge issues 2015-11-01 03:25:36 +00: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 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 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
Robert Adams e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
Diva Canto 82ea4179da Clean up viewer-based access control specifications. 2015-09-06 10:00:20 -07:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Melanie Thielker 028506cf3c Partial plumbing for the agent stateful module features negotiation 2015-08-20 00:18:45 +02:00
Diva Canto d9a9f6f43b Convert the enum to int before casting it to string for DB query 2015-08-08 13:47:42 -07:00
Diva Canto 959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
2015-08-08 12:12:50 -07:00
Oren Hurvitz c4f8630968 In the AgentCircuitData of HG users, set the last name to include the port
E.g., instead of "first.last @grid.example.com", the name is now "first.last @grid.example.com:8002"
2015-08-03 16:25:45 +03:00
AliciaRaven ce62824b1f Add HGFSAssetService to the HypergridService to provide HG support for FSAssets. 2015-08-02 20:02:36 +01:00
Diva Canto e5a1243abc Mantis #7657 and #7514. This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR

Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657.

Virus!
2015-08-01 18:58:05 -07:00
Diva Canto 3c596e47c6 Knocked off a few compiler warnings regarding unused variables. 2015-05-10 21:54:24 -07:00
Diva Canto eb9b16d284 Added simple test for IM in Robust too.
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
2015-05-10 21:49:24 -07:00
Diva Canto c74cef0f42 Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is. 2015-05-07 19:24:08 -07:00
Diva Canto 1abbad71b4 Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514 2015-05-05 20:59:09 -07:00